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

Commit 4b974c3d authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove the mRemoteTaskStackListeners lock." into main am: 68075145 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3556003



Change-Id: Ic995bea57d53e124a0fb21033024bc9afe7ae1f1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 947d7a2e 68075145

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) {