diff options
| author | 2023-06-21 08:23:43 +0000 | |
|---|---|---|
| committer | 2023-06-21 08:23:43 +0000 | |
| commit | 6e475ff8156b8835e5bc3c1f8ae9c3173ef2fdf2 (patch) | |
| tree | 58a5c6dcb0461418e1e70b10c1f1d40cbc5c5354 | |
| parent | 0917a8fa809ab3b690f5e0258261ac572192bfba (diff) | |
| parent | cdb2a7eac4c6797f1000d7436dc92416f8eba40d (diff) | |
Merge "Fix not removing split record in overview after dismissed" into udc-dev am: 1d328a774c am: cdb2a7eac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23745016
Change-Id: I42e05a7434f11a1a3558de42ee0874719d755936
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index 6e6e147a234b..acc1c5eb74b6 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -2860,7 +2860,9 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, for (int i = info.getChanges().size() - 1; i >= 0; --i) { final TransitionInfo.Change change = info.getChanges().get(i); final ActivityManager.RunningTaskInfo taskInfo = change.getTaskInfo(); - if (taskInfo != null && getStageOfTask(taskInfo) != null) { + if (taskInfo != null && (getStageOfTask(taskInfo) != null + || getSplitItemPosition(change.getLastParent()) + != SPLIT_POSITION_UNDEFINED)) { recentTasks.removeSplitPair(taskInfo.taskId); } } |