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

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

Browse Source 
* commit 'a50a0e90fdd748218b738b9c13393d65248dd2cd':
  Fix NPE when going from proxy to no proxy.
This commit is contained in:
Robert Greenwalt
2011-07-29 10:53:16 -07:00
committed by Android Git Automerger
parent fec26c5097 a50a0e90fd
commit 30f045c900
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

@@ -2300,7 +2300,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;