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

Commit f9665221 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am a128f5f8: am 1a230885: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE 

* commit 'a128f5f8':
  Fix NPE when going from proxy to no proxy.
parents bd176f36 a128f5f8

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

+1 −1
Original line number Diff line number Diff line
@@ -2484,7 +2484,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;