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

Commit 7e4adf84 authored by Chalard Jean's avatar Chalard Jean Committed by android-build-merger
Browse files

Merge "Fix: ConnectivityManager is initialized with a wrong context" into pi-dev am: ccf93b27 

am: 04a44257

Change-Id: I03a6c8ec52a5aa4fd7620d18f7cf75fa115be73b
parents 06498393 04a44257

core/java/android/app/ActivityThread.java

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



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