commit | 6307cd734d4c0cdcd27e91d490a2f7b39410fbed | [log] [tgz] |
---|---|---|
author | Jason Monk <jmonk@google.com> | Tue Aug 27 10:51:24 2013 -0400 |
committer | Jason Monk <jmonk@google.com> | Tue Aug 27 10:51:24 2013 -0400 |
tree | 0ebeed6910aefad144aa011702e2a7ee270470c6 | |
parent | 48f4246a7caea8448fc3bcc8b82e9d37e38ff597 [diff] |
Don't clear Global Proxy on boot. Doesn't clear the global proxy when a deprecated one is not found because there still may be a non-deprecated global proxy present. Bug: 10457179 Change-Id: I68e6d5aee7b4940f9315484060c7d82cb8ccfa70
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index ec6b063..136a85e 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java
@@ -3355,8 +3355,6 @@ } ProxyProperties p = new ProxyProperties(data[0], proxyPort, ""); setGlobalProxy(p); - } else { - setGlobalProxy(null); } }