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

am 30f045c9: am a50a0e90: Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE

Browse Source 
* commit '30f045c90071035c3b008b99d0e2d2773444a554':
  Fix NPE when going from proxy to no proxy.
This commit is contained in:
Robert Greenwalt
2011-07-29 10:55:58 -07:00
committed by Android Git Automerger
parent 2351e41ea8 30f045c900
commit 6e02db1b8d
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

@@ -2484,7 +2484,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
synchronized (this) { synchronized (this) {
if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return; if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
if (mDefaultProxy == proxy) return; if (mDefaultProxy == proxy) return;
if (!TextUtils.isEmpty(proxy.getHost())) { if (proxy != null && !TextUtils.isEmpty(proxy.getHost())) {
mDefaultProxy = proxy; mDefaultProxy = proxy;
} else { } else {
mDefaultProxy = null; mDefaultProxy = null;