LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '519006395204ba3eab77ae420d20eb70ebb78af5':
  Synchronize on all sendProxyBroadcast calls
This commit is contained in:
Jason Monk
2014-10-02 22:42:58 +00:00
committed by Android Git Automerger
parent 4da0928822 e3a7ae6118
commit cd7cb4df35
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -403,7 +403,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private ArrayList mInetLog; private ArrayList mInetLog;
// track the current default http proxy - tell the world if we get a new one (real change) // 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 Object mProxyLock = new Object();
private boolean mDefaultProxyDisabled = false; private boolean mDefaultProxyDisabled = false;
@@ -2537,12 +2537,12 @@ public class ConnectivityService extends IConnectivityManager.Stub {
} finally { } finally {
Binder.restoreCallingIdentity(token); Binder.restoreCallingIdentity(token);
} }
}
if (mGlobalProxy == null) { if (mGlobalProxy == null) {
proxyProperties = mDefaultProxy; proxyProperties = mDefaultProxy;
}
sendProxyBroadcast(proxyProperties);
} }
sendProxyBroadcast(proxyProperties);
} }
private void loadGlobalProxy() { private void loadGlobalProxy() {