diff options
| author | Jason Monk <jmonk@google.com> | 2013-10-15 11:15:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-15 11:15:01 +0000 |
| commit | c09e59110272d2613763a54a57e7da7c9f87f369 (patch) | |
| tree | 6b1c0dd7088a78c459a1a729b431a993e6ce5297 | |
| parent | 94c0057d67c2e0a4b88a4f735388639210260d0e (diff) | |
| parent | 90760c8fa36574d6cc9224046758317ca6f640bf (diff) | |
| download | frameworks_base-c09e59110272d2613763a54a57e7da7c9f87f369.zip frameworks_base-c09e59110272d2613763a54a57e7da7c9f87f369.tar.gz frameworks_base-c09e59110272d2613763a54a57e7da7c9f87f369.tar.bz2 | |
Merge "Fix error when PAC set rapidly" into klp-dev
| -rw-r--r-- | services/java/com/android/server/connectivity/PacManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 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; } |