Merge "Don't clear Global Proxy on boot." into klp-dev

This commit is contained in:
Jason Monk
2013-08-28 14:41:15 +00:00
committed by Android (Google) Code Review

View File

@@ -3355,8 +3355,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} }
ProxyProperties p = new ProxyProperties(data[0], proxyPort, ""); ProxyProperties p = new ProxyProperties(data[0], proxyPort, "");
setGlobalProxy(p); setGlobalProxy(p);
} else {
setGlobalProxy(null);
} }
} }