commit 30f045c90071035c3b008b99d0e2d2773444a554
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:53:16 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 29 10:53:16 2011 -0700
tree 5fd40e981cbcfdb7b2917ae3215b4ad2d2b725ae
parent fec26c50974443f25715dd6dc64e81f1ea7b496c
parent a50a0e90fdd748218b738b9c13393d65248dd2cd

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

* commit 'a50a0e90fdd748218b738b9c13393d65248dd2cd':
  Fix NPE when going from proxy to no proxy.

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

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 2f6bbec..2733fd3 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2300,7 +2300,7 @@
         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;