From 90760c8fa36574d6cc9224046758317ca6f640bf Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Mon, 14 Oct 2013 18:24:13 -0400
Subject: [PATCH] Fix error when PAC set rapidly

Stop the broadcast from being accidentally sent when PAC is in the process
of downloading / binding local proxy.  Only send broadcast when valid port
is contained (i.e. sent by PacManager).

Bug: 11168706
Change-Id: I998711fcf0a6bd82bdef413726ec41317752a57b
---
 services/java/com/android/server/connectivity/PacManager.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/java/com/android/server/connectivity/PacManager.java b/services/java/com/android/server/connectivity/PacManager.java
index 837fb05cc9234..7786fe6e42546 100644
--- a/services/java/com/android/server/connectivity/PacManager.java
+++ b/services/java/com/android/server/connectivity/PacManager.java
@@ -162,7 +162,7 @@ public class PacManager {
      */
     public synchronized boolean setCurrentProxyScriptUrl(ProxyProperties proxy) {
         if (!TextUtils.isEmpty(proxy.getPacFileUrl())) {
-            if (proxy.getPacFileUrl().equals(mPacUrl)) {
+            if (proxy.getPacFileUrl().equals(mPacUrl) && (proxy.getPort() > 0)) {
                 // Allow to send broadcast, nothing to do.
                 return false;
             }