From 01a790ad556662f09097ab59462c66e0fa6a6185 Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Tue, 27 Aug 2013 10:51:24 -0400
Subject: [PATCH] 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 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java
index ec6b063e82..136a85e0af 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);
         }
     }