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

Commit ccf93b27 authored by Chalard Jean's avatar Chalard Jean Committed by Android (Google) Code Review
Browse files

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

parents e28c42f7 100df0a6

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