Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fde1eb7c authored by Robert Greenwalt's avatar Robert Greenwalt
Browse files

Fix NPE when going from proxy to no proxy. 

bug:5081431
Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833
parent d20f60c8

services/java/com/android/server/ConnectivityService.java

+1 −1
Original line number Diff line number Diff line
@@ -2299,7 +2299,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
        synchronized (this) {

            if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;

            if (mDefaultProxy == proxy) return;

            if (!TextUtils.isEmpty(proxy.getHost())) {

            if (proxy != null && !TextUtils.isEmpty(proxy.getHost())) {

                mDefaultProxy = proxy;

            } else {

                mDefaultProxy = null;