diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-18 10:29:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-18 10:29:51 -0800 |
| commit | a8a448da25c62f54cac3318c17c69e851a4ecde9 (patch) | |
| tree | 05cfb3bba8f4dc9e9e79cba400b8085a49d46099 | |
| parent | ea04da7a183b526cdc79366822e4fc794d28cbd2 (diff) | |
| parent | e568672c9e57e1d7066e95ba547a1ae568409226 (diff) | |
| download | frameworks_base-a8a448da25c62f54cac3318c17c69e851a4ecde9.zip frameworks_base-a8a448da25c62f54cac3318c17c69e851a4ecde9.tar.gz frameworks_base-a8a448da25c62f54cac3318c17c69e851a4ecde9.tar.bz2 | |
am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
Fix NPE in ConnectivityService
| -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; } |