commit 1f1bdf26f91a27cc6f8f76a88463a58751042409
author Chalard Jean <jchalard@google.com> Tue Dec 25 10:55:10 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 25 10:55:10 2018 +0000
tree 9685ad110c79c2f993db9699d06db533918608ad
parent 4d52ab7341172824ade1e01b99a935c29457b4fe
parent 8fff22272e28b59bfec163ca8af175f38af28ec4

Merge "[PT17] Small cleanup of PacManager"

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 |