am c711d7a5: Merge "Don\'t clear Global Proxy on boot." into klp-dev

* commit 'c711d7a5e936f760bcd8cdf6afcfbf12020e983e':
  Don't clear Global Proxy on boot.
This commit is contained in:
Jason Monk
2013-08-28 07:43:39 -07:00
committed by Android Git Automerger

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);
} }
} }