commit 027f505669b02f690b1d5fc451034e9c762f5b09
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:03:37 2011 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Fri Jul 29 10:03:37 2011 -0700
tree e5e859beccbc2fe9d85b53479fb3ab3916097c54
parent 9520d6af5a2a00333af0244b6cbe3a9e27513bb6

Fix NPE when going from proxy to no proxy.

bug:5081431
Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833

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;