commit 8fff22272e28b59bfec163ca8af175f38af28ec4
author Chalard Jean <jchalard@google.com> Mon Jun 11 16:58:52 2018 +0900
committer Chalard Jean <jchalard@google.com> Thu Dec 20 18:25:22 2018 +0900
tree bdada2d1def61ff6833702c1c78ccf218f8d1c89
parent c5b457ba483bf4a6cbb648fb369805e9a7b5ac33

[PT17] Small cleanup of PacManager

Test: runtest
Change-Id: I94a10cbae7f2d87bd8a68ae4f9972a728f4942c3

services/core/java/com/android/server/connectivity/ProxyTracker.java

diff --git a/services/core/java/com/android/server/connectivity/ProxyTracker.java b/services/core/java/com/android/server/connectivity/ProxyTracker.java
index 15468ff..fdddccd 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 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 |