diff options
| author | Jason Monk <jmonk@google.com> | 2013-09-13 20:31:53 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-13 20:31:54 +0000 |
| commit | 312c495f4b8d002264772f61fe1fa3ef87bf3e52 (patch) | |
| tree | 8508f800432e603ae76330fa3d0c358fe4a85c03 /services/java/com/android/server/ConnectivityService.java | |
| parent | cac2428da4a22d9526af09e1457a6b644b2c2057 (diff) | |
| parent | 6f8a68f49a7e8cf86104e721a1e8be7568b5f730 (diff) | |
Merge "Guarantee that PAC Local Proxy owns Port" into klp-dev
Diffstat (limited to 'services/java/com/android/server/ConnectivityService.java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 3f8d7ebccae4..3c88222f6163 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -3463,7 +3463,7 @@ public class ConnectivityService extends IConnectivityManager.Stub { private void sendProxyBroadcast(ProxyProperties proxy) { if (proxy == null) proxy = new ProxyProperties("", 0, ""); - mPacManager.setCurrentProxyScriptUrl(proxy); + if (mPacManager.setCurrentProxyScriptUrl(proxy)) return; if (DBG) log("sending Proxy Broadcast for " + proxy); Intent intent = new Intent(Proxy.PROXY_CHANGE_ACTION); intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING | |