From d5e95119adc57c0f1da7b96cf82d02795d0bed57 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Mon, 11 Jun 2018 16:58:52 +0900 Subject: [PATCH] [PT17] Small cleanup of PacManager Test: runtest Change-Id: I94a10cbae7f2d87bd8a68ae4f9972a728f4942c3 --- .../java/com/android/server/connectivity/ProxyTracker.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java index 15468ff05c..fdddccd207 100644 --- a/services/core/java/com/android/server/connectivity/ProxyTracker.java +++ b/services/core/java/com/android/server/connectivity/ProxyTracker.java @@ -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 |