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

Fix Global Proxy when used with PAC am: 18e669e5d0

Browse Source 
Original change: undetermined

Change-Id: Ie72ac31a601c96420222b3d018fac9992bfa86e6
This commit is contained in:
Jason Monk
2021-05-31 07:16:16 +00:00
committed by Automerger Merge Worker
parent 22800a1348 18e669e5d0
commit 0b082bf3aa
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -3517,6 +3517,18 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (DBG) log("Invalid proxy properties, ignoring: " + proxy.toString());
return;
}
// This call could be coming from the PacManager, containing the port of the local
// proxy. If this new proxy matches the global proxy then copy this proxy to the
// global (to get the correct local port), and send a broadcast.
// TODO: Switch PacManager to have its own message to send back rather than
// reusing EVENT_HAS_CHANGED_PROXY and this call to handleApplyDefaultProxy.
if ((mGlobalProxy != null) && (proxy != null) && (proxy.getPacFileUrl() != null)
&& proxy.getPacFileUrl().equals(mGlobalProxy.getPacFileUrl())) {
mGlobalProxy = proxy;
sendProxyBroadcast(mGlobalProxy);
return;
}
mDefaultProxy = proxy;
if (mGlobalProxy != null) return;