Merge "keyguard: guard mKeyguardLockedStateListeners with lock" into main (e8c89559) · Commits · e / os / android_frameworks_base

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