commit 2b1ac58fdf8c4170b456f64c9d4e888ec0b8a4a9
author Robert Greenwalt <rgreenwalt@google.com> Mon Nov 18 10:37:51 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Mon Nov 18 10:37:51 2013 -0800
tree 7389617c2762cd27ff018ac0a2776de38ae759b8
parent bfe9d334c4cf612d6cca4e36206cf278e9b63b5c
parent 6668bcdc88226c2f36f5ba4084661477e0e517c4

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

* commit '6668bcdc88226c2f36f5ba4084661477e0e517c4':
  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 52c7b40..4bdf992 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3428,7 +3428,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;
             }