Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e568672c9e57e1d7066e95ba547a1ae568409226':
  Fix NPE in ConnectivityService
This commit is contained in:
Robert Greenwalt
2013-11-18 10:29:51 -08:00
committed by Android Git Automerger
parent ea04da7a18 e568672c9e
commit a8a448da25
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

@@ -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;
}