diff options
| author | Paul Jensen <pauljensen@google.com> | 2015-05-06 07:32:40 -0400 |
|---|---|---|
| committer | Paul Jensen <pauljensen@google.com> | 2015-05-18 17:05:51 +0000 |
| commit | cee9b51c4beec4494d78bab784ba7e7e20c30e31 (patch) | |
| tree | 476a7d99339932792943e87fc646546469a5fb1c /core/java/android/app/ActivityThread.java | |
| parent | 424681e43e454bfcbceb863ddccb875ea57ec26f (diff) | |
| download | frameworks_base-cee9b51c4beec4494d78bab784ba7e7e20c30e31.zip frameworks_base-cee9b51c4beec4494d78bab784ba7e7e20c30e31.tar.gz frameworks_base-cee9b51c4beec4494d78bab784ba7e7e20c30e31.tar.bz2 | |
Query HTTP proxy for network via a new API to avoid permissions exceptions
Add @hidden ConnectivityManager.getProxyForNetwork() API.
Bug:20470604
Change-Id: I6a9bc4afc8273bc43b14cdeccfedbbf3ff66be40
Diffstat (limited to 'core/java/android/app/ActivityThread.java')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index da6d8c5..b81ddcb 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4552,7 +4552,7 @@ public final class ActivityThread { // crash if we can't get it. IConnectivityManager service = IConnectivityManager.Stub.asInterface(b); try { - final ProxyInfo proxyInfo = service.getDefaultProxy(); + final ProxyInfo proxyInfo = service.getProxyForNetwork(null); Proxy.setHttpProxySystemProperty(proxyInfo); } catch (RemoteException e) {} } |