commit 4a534e00d83e6b41862ea54ca4f6a84d3e105585
author Torne (Richard Coles) <torne@google.com> Tue Oct 15 11:48:17 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 15 11:48:17 2013 +0000
tree 863416bac67bf5732f488d308d9349d1cb405e78
parent c09e59110272d2613763a54a57e7da7c9f87f369
parent 2eac50bf63c96bfcfe58db0be1999e782a98d25b

Merge "Delete BrowserTestPlugin." into klp-dev

services/java/com/android/server/connectivity/PacManager.java

diff --git a/services/java/com/android/server/connectivity/PacManager.java b/services/java/com/android/server/connectivity/PacManager.java
index 837fb05..7786fe6 100644
--- a/services/java/com/android/server/connectivity/PacManager.java
+++ b/services/java/com/android/server/connectivity/PacManager.java
@@ -162,7 +162,7 @@
      */
     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;
             }