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

This commit is contained in:
Robert Greenwalt
2011-07-29 10:51:32 -07:00
committed by Android (Google) Code Review

View File

@@ -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;