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

Commit 356edc5f authored by Tetsutoki Shiozawa's avatar Tetsutoki Shiozawa Committed by android-build-merger
Browse files

Merge "Fix: ConnectivityManager is initialized with a wrong context" 

am: 4517eacd

Change-Id: I0629b33b8cc5e155b4500cc15901985dbf0a31f2
parents 77390bf3 4517eacd

core/java/android/app/ActivityThread.java

+2 −1
Original line number Diff line number Diff line
@@ -964,7 +964,8 @@ public final class ActivityThread { 
        }



        public void setHttpProxy(String host, String port, String exclList, Uri pacFileUrl) {

            final ConnectivityManager cm = ConnectivityManager.from(getSystemContext());

            final ConnectivityManager cm = ConnectivityManager.from(

                getApplication() != null ? getApplication() : getSystemContext());

            final Network network = cm.getBoundNetworkForProcess();

            if (network != null) {

                Proxy.setHttpProxySystemProperty(cm.getDefaultProxy());