diff options
| author | 2013-08-28 07:45:07 -0700 | |
|---|---|---|
| committer | 2013-08-28 07:45:07 -0700 | |
| commit | 647b6f5ed276bf93d95e5801e5e8af2802ef5fbb (patch) | |
| tree | 50ca3d9e212cd488db4dac7fb7afc79395a69e9c | |
| parent | 4315b3edb8975eab541f9f33367265caeaa05640 (diff) | |
| parent | 59d234e71c4f3bf08d09a293305aac043550e840 (diff) | |
am 59d234e7: am 1f809c77: Merge "Don\'t clear Global Proxy on boot." into klp-dev
* commit '59d234e71c4f3bf08d09a293305aac043550e840':
Don't clear Global Proxy on boot.
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index ec6b063e8245..136a85e0af16 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3355,8 +3355,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { } ProxyProperties p = new ProxyProperties(data[0], proxyPort, ""); setGlobalProxy(p); - } else { - setGlobalProxy(null); } } |