From fde1eb7cf88e488d619d3168f83fb2e740d39296 Mon Sep 17 00:00:00 2001
From: Robert Greenwalt <rgreenwalt@google.com>
Date: Fri, 29 Jul 2011 10:03:37 -0700
Subject: Fix NPE when going from proxy to no proxy.

bug:5081431
Change-Id: I68a8cca94e4612bd9ee2faf1123e0b63dc25b833
---
 services/java/com/android/server/ConnectivityService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 8ad9f91ab2a4..c9ab806dfb24 100644
--- 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;
-- 
cgit v1.2.3-59-g8ed1b