commit cf8c894ef3330739da845c8f032ab3349ace68cb
author Robert Greenwalt <rgreenwalt@google.com> Mon Nov 18 09:43:59 2013 -0800
committer Robert Greenwalt <rgreenwalt@google.com> Mon Nov 18 09:43:59 2013 -0800
tree 7145838626b39c36e1865f52bfa8f89c48022d93
parent 08e512b425be50caeefb7ccebf971c06e7557cfb

Fix NPE in ConnectivityService

bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a

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 478f8c7..baff661 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3457,7 +3457,7 @@
         synchronized (mProxyLock) {
             if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
             if (mDefaultProxy == proxy) return; // catches repeated nulls
-            if (!proxy.isValid()) {
+            if (proxy != null &&  !proxy.isValid()) {
                 if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString());
                 return;
             }