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

Merge "[PT17] Small cleanup of PacManager" am: 6da845e999 am: 2d0084fd8f

Browse Source 
am: 130e23f3f0

Change-Id: I9e4cf1680ec719bc1fab9df36ad08229401da1eb
This commit is contained in:
Chalard Jean
2018-12-25 03:29:16 -08:00
committed by android-build-merger
parent 5cc9d59a78 130e23f3f0
commit 0b601607a6
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/connectivity/ProxyTracker.java
View File

@@ -208,7 +208,10 @@ public class ProxyTracker {
public void sendProxyBroadcast() {
final ProxyInfo defaultProxy = getDefaultProxy();
final ProxyInfo proxyInfo = null != defaultProxy ? defaultProxy : new ProxyInfo("", 0, "");
if (mPacManager.setCurrentProxyScriptUrl(proxyInfo)) return;
if (mPacManager.setCurrentProxyScriptUrl(proxyInfo)
== PacManager.ToSendOrNotToSendBroadcast.DONT_SEND_BROADCAST) {
return;
}
if (DBG) Slog.d(TAG, "sending Proxy Broadcast for " + proxyInfo);
Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION);
intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING |