Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59d234e7 authored by Jason Monk's avatar Jason Monk Committed by Android Git Automerger
Browse files

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

* commit '1f809c77':
  Don't clear Global Proxy on boot.
parents 03049719 1f809c77

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

+0 −2
Original line number Diff line number Diff line
@@ -3355,8 +3355,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { 
            }

            ProxyProperties p = new ProxyProperties(data[0], proxyPort, "");

            setGlobalProxy(p);

        } else {

            setGlobalProxy(null);

        }

    }