Merge "Fix NPE when going from proxy to no proxy." into honeycomb-LTE
This commit is contained in:
commit
a50a0e90fd
1 changed files with 1 additions and 1 deletions
|
|
@ -2299,7 +2299,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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue