am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev

* commit 'c09e59110272d2613763a54a57e7da7c9f87f369': Fix error when PAC set rapidly
2013-10-15 05:03:30 -07:00
parent c5f742d4de c09e591102
commit b46eb9042b
1 changed files with 1 additions and 1 deletions
--- 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;
            }