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

2013-10-15 11:15:00 +00:00
parent 94c0057d67 90760c8fa3
commit c09e591102
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;
            }