Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Chalard Jean
2018-05-23 17:59:59 +00:00
committed by Android (Google) Code Review
parent e28c42f785 100df0a66c
commit ccf93b2792
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/app/ActivityThread.java
View File

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