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

Commit d4bea0f3 authored by Olivier St-Onge's avatar Olivier St-Onge Committed by Android (Google) Code Review
Browse files

Merge "Prevent ConcurrentModificationException for IndividualSensorPrivacyControllerImpl" into main

parents 5014643c 9d3aaa10
Loading
Loading
Loading
Loading
+3 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import android.util.SparseBooleanArray;
import androidx.annotation.NonNull;

import com.android.internal.camera.flags.Flags;
import com.android.systemui.util.ListenerSet;

import java.util.Set;

@@ -43,7 +44,7 @@ public class IndividualSensorPrivacyControllerImpl implements IndividualSensorPr
    private final SparseBooleanArray mSoftwareToggleState = new SparseBooleanArray();
    private final SparseBooleanArray mHardwareToggleState = new SparseBooleanArray();
    private Boolean mRequiresAuthentication;
    private final Set<Callback> mCallbacks = new ArraySet<>();
    private final ListenerSet<Callback> mCallbacks = new ListenerSet<>();

    public IndividualSensorPrivacyControllerImpl(
            @NonNull SensorPrivacyManager sensorPrivacyManager) {
@@ -115,7 +116,7 @@ public class IndividualSensorPrivacyControllerImpl implements IndividualSensorPr

    @Override
    public void addCallback(@NonNull Callback listener) {
        mCallbacks.add(listener);
        mCallbacks.addIfAbsent(listener);
    }

    @Override