commit 6e02db1b8dad78637fd67ecb40bb74084dca1abf
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:55:58 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jul 29 10:55:58 2011 -0700
tree 17bb12864597bb00a4e7327b76744ff11905b627
parent 2351e41ea89ee47187aaddc4f83d02a8be5d86a4
parent 30f045c90071035c3b008b99d0e2d2773444a554

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

* commit '30f045c90071035c3b008b99d0e2d2773444a554':
  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 9a9cc8f..2a724d4 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2484,7 +2484,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;