Merge "Synchronize on all sendProxyBroadcast calls" into lmp-dev (51900639) · Commits · e / os / android_frameworks_base

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

+5 −5

Original line number	Diff line number	Diff line
		@@ -403,7 +403,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		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,13 +2537,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
		} finally {
		Binder.restoreCallingIdentity(token);
		}
		}

		if (mGlobalProxy == null) {
		proxyProperties = mDefaultProxy;
		}
		sendProxyBroadcast(proxyProperties);
		}
		}

		private void loadGlobalProxy() {
		ContentResolver res = mContext.getContentResolver();