Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: Idc50846f34457ebb9efaa9f25b439fbcd44fd19b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2023-07-06 19:14:35 +00:00
committed by Automerger Merge Worker
parent aedb6e4940 b3548d0b34
commit b68641c407
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -189,15 +189,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();
}