LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'a8a448da25c62f54cac3318c17c69e851a4ecde9':
  Fix NPE in ConnectivityService
This commit is contained in:
Robert Greenwalt
2013-11-18 10:33:46 -08:00
committed by Android Git Automerger
parent 20a290e8ac 5654cd271f
commit 3863b8a1e7
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/java/com/android/server/ConnectivityService.java
View File

@@ -3460,7 +3460,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
synchronized (mProxyLock) { synchronized (mProxyLock) {
if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return; if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
if (mDefaultProxy == proxy) return; // catches repeated nulls if (mDefaultProxy == proxy) return; // catches repeated nulls
if (!proxy.isValid()) { if (proxy != null && !proxy.isValid()) {
if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString()); if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString());
return; return;
} }