commit cd7cb4df35bc89df489f72f32b569d0babca7b26
author Jason Monk <jmonk@google.com> Thu Oct 02 22:42:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Oct 02 22:42:58 2014 +0000
tree f462b17dd54f15544f27d426f03d81b2acc61a57
parent 4da0928822b0719f072470ba284ca2eb11a28a55
parent e3a7ae61183dead507eff29de2a9ca430c95401b

am 51900639: Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev

* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index a9cff22..3dbbf23 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -403,7 +403,7 @@
     private ArrayList mInetLog;
 
     // track the current default http proxy - tell the world if we get a new one (real change)
-    private ProxyInfo mDefaultProxy = null;
+    private volatile ProxyInfo mDefaultProxy = null;
     private Object mProxyLock = new Object();
     private boolean mDefaultProxyDisabled = false;
 
@@ -2537,12 +2537,12 @@
             } finally {
                 Binder.restoreCallingIdentity(token);
             }
-        }
 
-        if (mGlobalProxy == null) {
-            proxyProperties = mDefaultProxy;
+            if (mGlobalProxy == null) {
+                proxyProperties = mDefaultProxy;
+            }
+            sendProxyBroadcast(proxyProperties);
         }
-        sendProxyBroadcast(proxyProperties);
     }
 
     private void loadGlobalProxy() {