commit 51213d943b3931434cbd196a8a159ee325a4e3fc
author Robert Greenwalt <rgreenwalt@google.com> Mon Nov 18 10:33:46 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 18 10:33:46 2013 -0800
tree 7d846b53aaa51be4d2d815c15f3dfd4e0a062b46
parent 5b95025059f0925ad8d11bf503eb2acb4cc63228
parent a8a448da25c62f54cac3318c17c69e851a4ecde9

am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev

* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService

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 1574667..d42ae3a 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3460,7 +3460,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;
             }