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

2013-08-28 14:41:15 +00:00 · 2013-08-28 14:41:15 +00:00 · c711d7a5e9
commit c711d7a5e9
parent 79d505d075 01a790ad55
1 changed files with 0 additions and 2 deletions
--- 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);
        }
    }