commit c711d7a5e936f760bcd8cdf6afcfbf12020e983e
author Jason Monk <jmonk@google.com> Wed Aug 28 14:41:15 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 28 14:41:15 2013 +0000
tree 68078cfd070f6fd29515ff755b6d4a4bd05157cf
parent 79d505d0757c9f4381f011cfc43532c4331c5f47
parent 01a790ad556662f09097ab59462c66e0fa6a6185

Merge "Don't clear Global Proxy on boot." into klp-dev

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