diff options
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index 2ecd3120345d..aa360848ace2 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -963,7 +963,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()); |