diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-18 09:43:59 -0800 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-18 09:43:59 -0800 |
| commit | a8dae99d76903afd40664ae96dc5cc0b135dc930 (patch) | |
| tree | 55170edf734e96baebaedf8b0682a0fe6ffc01f6 /services | |
| parent | 564fb1b8ce4aa603bd0d5b3a077ba27d66e77c32 (diff) | |
| download | frameworks_base-a8dae99d76903afd40664ae96dc5cc0b135dc930.zip frameworks_base-a8dae99d76903afd40664ae96dc5cc0b135dc930.tar.gz frameworks_base-a8dae99d76903afd40664ae96dc5cc0b135dc930.tar.bz2 | |
Fix NPE in ConnectivityService
bug:11727708
Change-Id: Ia8ca9d1e23f021feaf4b772ec38d1d0e89b0cd2a
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 2 |
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 478f8c7..baff661 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; } |