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

Commit 1a230885 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android (Google) Code Review
Browse files

Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE

parents 0d8acea9 fde1eb7c

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;