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

Merge "[PT17] Small cleanup of PacManager"

Browse Source 
am: 6da845e999

Change-Id: If5c8f840adaa9dd13e5cf95aedc782913aee9179
This commit is contained in:
Chalard Jean
2018-12-25 03:08:21 -08:00
committed by android-build-merger
parent 77dfb10a6f 6da845e999
commit 2d0084fd8f
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 |