am 59d234e7: am 1f809c77: Merge "Don\'t clear Global Proxy on boot." into klp-dev

* commit '59d234e71c4f3bf08d09a293305aac043550e840': Don't clear Global Proxy on boot.
2013-08-28 07:45:07 -07:00
parent 4315b3edb8 59d234e71c
commit 647b6f5ed2
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);
        }
    }