summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Greenwalt <rgreenwalt@google.com>2013-11-18 09:43:59 -0800
committerRobert Greenwalt <rgreenwalt@google.com>2013-11-18 09:43:59 -0800
commita8dae99d76903afd40664ae96dc5cc0b135dc930 (patch)
tree55170edf734e96baebaedf8b0682a0fe6ffc01f6
parent564fb1b8ce4aa603bd0d5b3a077ba27d66e77c32 (diff)
downloadbase-a8dae99d76903afd40664ae96dc5cc0b135dc930.tar.gz
Fix NPE in ConnectivityService
bug:11727708 Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
-rw-r--r--services/java/com/android/server/ConnectivityService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index 478f8c7676ea..baff66117088 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -3457,7 +3457,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
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;
}