Fix NPE when going from proxy to no proxy.

bug:5081431 Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833
2011-07-29 10:03:37 -07:00
parent 9520d6af5a
commit 027f505669
1 changed files with 1 additions and 1 deletions
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -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;