Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf0f97a3 authored by Jason Monk's avatar Jason Monk
Browse files

Synchronize on all sendProxyBroadcast calls 

To avoid race conditions.  Also make mDefaultProxy volatile for
safety.

Bug: 17697364
Change-Id: I8f0abb1a6e1c816f3addc11a69ff794ad767f2cf
parent 74c2ec36

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();