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

Merge "ConnectivityService: detach the logic of global proxy." am: f386f9ec7e

Browse Source 
Original change: undetermined

Change-Id: I4dec6ab3db4537cb7d3c6c8a74ad8a62198b3b2a
This commit is contained in:
Chia-chi Yeh
2021-05-31 12:08:24 +00:00
committed by Automerger Merge Worker
parent 8459995b62 f386f9ec7e
commit 2bd9374bda
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/ConnectivityService.java
View File

@@ -2550,9 +2550,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
public synchronized ProxyProperties getProxy() {
if (mGlobalProxy != null) return mGlobalProxy;
if (mDefaultProxy != null) return mDefaultProxy;
return null;
return mDefaultProxy;
}
public void setGlobalProxy(ProxyProperties proxyProperties) {
@@ -2583,7 +2581,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
if (mGlobalProxy == null) {
proxyProperties = mDefaultProxy;
}
sendProxyBroadcast(proxyProperties);
//sendProxyBroadcast(proxyProperties);
}
private void loadGlobalProxy() {
@@ -2619,9 +2617,6 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
}
if (VDBG) log("changing default proxy to " + proxy);
// global trumps default, if set, ignore this.
if (mGlobalProxy != null) return;
sendProxyBroadcast(proxy);
}