Merge "Remove the mRemoteTaskStackListeners lock." into main (68075145) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/TaskChangeNotificationController.java

+9 −16

Original line number	Diff line number	Diff line
		@@ -72,7 +72,6 @@ class TaskChangeNotificationController {
		private final Handler mHandler;

		// Task stack change listeners in a remote process.
		@GuardedBy("mRemoteTaskStackListeners")
		private final RemoteCallbackList<ITaskStackListener> mRemoteTaskStackListeners =
		new RemoteCallbackList<>();

		@@ -311,11 +310,9 @@ class TaskChangeNotificationController {
		}
		}
		} else if (listener != null) {
		synchronized (mRemoteTaskStackListeners) {
		mRemoteTaskStackListeners.register(listener);
		}
		}
		}

		public void unregisterTaskStackListener(ITaskStackListener listener) {
		if (listener instanceof Binder) {
		@@ -323,14 +320,11 @@ class TaskChangeNotificationController {
		mLocalTaskStackListeners.remove(listener);
		}
		} else if (listener != null) {
		synchronized (mRemoteTaskStackListeners) {
		mRemoteTaskStackListeners.unregister(listener);
		}
		}
		}

		private void forAllRemoteListeners(TaskStackConsumer callback, Message message) {
		synchronized (mRemoteTaskStackListeners) {
		for (int i = mRemoteTaskStackListeners.beginBroadcast() - 1; i >= 0; i--) {
		try {
		// Make a one-way callback to the listener
		@@ -341,7 +335,6 @@ class TaskChangeNotificationController {
		}
		mRemoteTaskStackListeners.finishBroadcast();
		}
		}

		private void forAllLocalListeners(TaskStackConsumer callback, Message message) {
		synchronized (mLocalTaskStackListeners) {