commit 01a790ad556662f09097ab59462c66e0fa6a6185
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 5b8b6751f34ff68c7f5f31eaced9737d86f67a59

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

services/java/com/android/server/ConnectivityService.java

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