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

Commit b47e5294 authored by Mady Mellor's avatar Mady Mellor Committed by Android (Google) Code Review
Browse files

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

parents da05223f 2902b938
Loading
Loading
Loading
Loading
+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();
    }