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

Commit b3548d0b authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Allow multiple close transactions for task view" into udc-qpr-dev am: b47e5294 

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



Change-Id: I99642fb4713f0e127d30c9808c2331dacb070f6f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e9eb643e b47e5294

libs/WindowManager/Shell/src/com/android/wm/shell/taskview/TaskViewTransitions.java

+3 −8
Original line number Diff line number Diff line
@@ -202,15 +202,10 @@ public class TaskViewTransitions implements Transitions.TransitionHandler { 
        if (taskView == null) return null;

        // Opening types should all be initiated by shell

        if (!TransitionUtil.isClosingType(request.getType())) return null;

        PendingTransition pending = findPendingCloseTransition(taskView);

        if (pending == null) {

            pending = new PendingTransition(request.getType(), null, taskView, null /* cookie */);

        }

        if (pending.mClaimed != null) {

            throw new IllegalStateException("Task is closing in 2 collecting transitions?"

                    + " This state doesn't make sense");

        }

        PendingTransition pending = new PendingTransition(request.getType(), null,

                taskView, null /* cookie */);

        pending.mClaimed = transition;

        mPending.add(pending);

        return new WindowContainerTransaction();

    }