summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jason Monk <jmonk@google.com> 2013-08-27 10:51:24 -0400
committer Jason Monk <jmonk@google.com> 2013-08-27 10:51:24 -0400
commita8220a73c5cb1a65ca7a457f66c97e4e4c32ee4b (patch)
treec43e71e7d24063eee3771a61eacdfa55200558e8
parent94366313331a789440a3c077173aafcb85cabe78 (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
-rw-r--r--services/java/com/android/server/ConnectivityService.java2
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);
}
}