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

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

Change-Id: I99642fb4713f0e127d30c9808c2331dacb070f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2023-07-06 18:34:04 +00:00
committed by Automerger Merge Worker
parent e9eb643e06 b47e529463
commit b3548d0b34
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

@@ -202,15 +202,10 @@ public class TaskViewTransitions implements Transitions.TransitionHandler {
if (taskView == null) return null; if (taskView == null) return null;
// Opening types should all be initiated by shell // Opening types should all be initiated by shell
if (!TransitionUtil.isClosingType(request.getType())) return null; if (!TransitionUtil.isClosingType(request.getType())) return null;
PendingTransition pending = findPendingCloseTransition(taskView); PendingTransition pending = new PendingTransition(request.getType(), null,
if (pending == null) { taskView, null /* cookie */);
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");
}
pending.mClaimed = transition; pending.mClaimed = transition;
mPending.add(pending);
return new WindowContainerTransaction(); return new WindowContainerTransaction();
} }