commit a50a0e90fdd748218b738b9c13393d65248dd2cd
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:51:32 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 29 10:51:32 2011 -0700
tree ce2862a2a0904d5be1472192d2c73897911158f1
parent f3ab069bec358f8138fed5ceabe64e303ac7d8f9
parent 027f505669b02f690b1d5fc451034e9c762f5b09

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

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 8ad9f91..c9ab806 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -2299,7 +2299,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;