joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
* commit 'a50a0e90fd':
  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
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;