diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2013-11-18 10:33:46 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-18 10:33:46 -0800 |
| commit | 51213d943b3931434cbd196a8a159ee325a4e3fc (patch) | |
| tree | 7d846b53aaa51be4d2d815c15f3dfd4e0a062b46 /services/java/com/android | |
| parent | 5b95025059f0925ad8d11bf503eb2acb4cc63228 (diff) | |
| parent | a8a448da25c62f54cac3318c17c69e851a4ecde9 (diff) | |
| download | frameworks_base-51213d943b3931434cbd196a8a159ee325a4e3fc.zip frameworks_base-51213d943b3931434cbd196a8a159ee325a4e3fc.tar.gz frameworks_base-51213d943b3931434cbd196a8a159ee325a4e3fc.tar.bz2 | |
am a8a448da: am e568672c: Merge "Fix NPE in ConnectivityService" into klp-dev
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
Fix NPE in ConnectivityService
Diffstat (limited to 'services/java/com/android')
| -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 1574667..d42ae3a 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3460,7 +3460,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; } |