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

Commit a2681383 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am acace94c: Fix race condition by guarding callbacks 

* commit 'acace94c':
  Fix race condition by guarding callbacks
parents 7a193899 acace94c

packages/SystemUI/src/com/android/systemui/statusbar/policy/SecurityControllerImpl.java

+18 −10
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import android.text.TextUtils; 
import android.util.Log;

import android.util.SparseArray;



import com.android.internal.annotations.GuardedBy;

import com.android.internal.net.LegacyVpnInfo;

import com.android.internal.net.VpnConfig;

import com.android.internal.net.VpnInfo;
@@ -62,8 +63,9 @@ public class SecurityControllerImpl implements SecurityController { 
    private final IConnectivityManager mConnectivityManagerService;

    private final DevicePolicyManager mDevicePolicyManager;

    private final UserManager mUserManager;

    private final ArrayList<SecurityControllerCallback> mCallbacks

            = new ArrayList<SecurityControllerCallback>();



    @GuardedBy("mCallbacks")

    private final ArrayList<SecurityControllerCallback> mCallbacks = new ArrayList<>();



    private SparseArray<VpnConfig> mCurrentVpns = new SparseArray<>();

    private int mCurrentUserId;
@@ -161,17 +163,21 @@ public class SecurityControllerImpl implements SecurityController { 


    @Override

    public void removeCallback(SecurityControllerCallback callback) {

        synchronized (mCallbacks) {

            if (callback == null) return;

            if (DEBUG) Log.d(TAG, "removeCallback " + callback);

            mCallbacks.remove(callback);

        }

    }



    @Override

    public void addCallback(SecurityControllerCallback callback) {

        synchronized (mCallbacks) {

            if (callback == null || mCallbacks.contains(callback)) return;

            if (DEBUG) Log.d(TAG, "addCallback " + callback);

            mCallbacks.add(callback);

        }

    }



    @Override

    public void onUserSwitched(int newUserId) {
@@ -202,10 +208,12 @@ public class SecurityControllerImpl implements SecurityController { 
    }



    private void fireCallbacks() {

        synchronized (mCallbacks) {

            for (SecurityControllerCallback callback : mCallbacks) {

                callback.onStateChanged();

            }

        }

    }



    private void updateState() {

        // Find all users with an active VPN