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

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

Browse Source 
* commit '1a230885b356256e91b3bf006ec72213ba6f8f76':
  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 86574d66da 1a230885b3
commit a128f5f8c9
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) {
if (mDefaultProxy != null && mDefaultProxy.equals(proxy)) return;
if (mDefaultProxy == proxy) return;
if (!TextUtils.isEmpty(proxy.getHost())) {
if (proxy != null && !TextUtils.isEmpty(proxy.getHost())) {
mDefaultProxy = proxy;
} else {
mDefaultProxy = null;