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

Commit 4a9fe19e authored by Yifei Zhang's avatar Yifei Zhang
Browse files

keyguard: guard mKeyguardLockedStateListeners with lock 

- Change @GuardedBy annotation to @GuardedBy("itself") for consistency

Flag: EXEMPT, bug fix
Test: build
Bug: 375029840
Change-Id: I0fff886cbc04d8efe2e3d3f2fa7e38bb7ee042f7
parent e3a475ae

core/java/android/app/KeyguardManager.java

+9 −5
Original line number Diff line number Diff line
@@ -255,12 +255,16 @@ public class KeyguardManager { 
            new IKeyguardLockedStateListener.Stub() {

                @Override

                public void onKeyguardLockedStateChanged(boolean isKeyguardLocked) {

                    synchronized (mKeyguardLockedStateListeners) {

                        mKeyguardLockedStateListeners.forEach((listener, executor) -> {

                            executor.execute(

                                    () -> listener.onKeyguardLockedStateChanged(isKeyguardLocked));

                        });

                    }

                }

            };



    @GuardedBy("itself")

    private final ArrayMap<KeyguardLockedStateListener, Executor>

            mKeyguardLockedStateListeners = new ArrayMap<>();
@@ -280,7 +284,7 @@ public class KeyguardManager { 
                }

            };



    @GuardedBy("mDeviceLockedStateListeners")

    @GuardedBy("itself")

    private final ArrayMap<DeviceLockedStateListener, Executor>

            mDeviceLockedStateListeners = new ArrayMap<>();