LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Cleanup setGlobalProxy" am: 376274c277

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1640148

Change-Id: I0052f30d52f00f40b933eb1573b1a0de37e9cba2
This commit is contained in:
Chalard Jean
2021-04-06 06:50:15 +00:00
committed by Automerger Merge Worker
parent fdfa2d00d9 376274c277
commit 676eccd672
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
framework/src/android/net/ConnectivityManager.java
View File

@@ -3140,18 +3140,27 @@ public class ConnectivityManager {
}
/**
* Set a network-independent global http proxy. This is not normally what you want
* for typical HTTP proxies - they are general network dependent. However if you're
* doing something unusual like general internal filtering this may be useful. On
* a private network where the proxy is not accessible, you may break HTTP using this.
* Set a network-independent global HTTP proxy.
*
* @param p A {@link ProxyInfo} object defining the new global
* HTTP proxy. A {@code null} value will clear the global HTTP proxy.
* This sets an HTTP proxy that applies to all networks and overrides any network-specific
* proxy. If set, HTTP libraries that are proxy-aware will use this global proxy when
* accessing any network, regardless of what the settings for that network are.
*
* Note that HTTP proxies are by nature typically network-dependent, and setting a global
* proxy is likely to break networking on multiple networks. This method is only meant
* for device policy clients looking to do general internal filtering or similar use cases.
*
* {@see #getGlobalProxy}
* {@see LinkProperties#getHttpProxy}
*
* @param p A {@link ProxyInfo} object defining the new global HTTP proxy. Calling this
* method with a {@code null} value will clear the global HTTP proxy.
* @hide
*/
// Used by Device Policy Manager to set the global proxy.
@SystemApi(client = MODULE_LIBRARIES)
@RequiresPermission(android.Manifest.permission.NETWORK_STACK)
public void setGlobalProxy(@Nullable ProxyInfo p) {
public void setGlobalProxy(@Nullable final ProxyInfo p) {
try {
mService.setGlobalProxy(p);
} catch (RemoteException e) {