commit 1d328a774cda542342568ec6d247617084d15fb1
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Jun 21 06:58:11 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 21 06:58:11 2023 +0000
tree 2dcbdad0ce5f2eb7bf57d79ed9ddca0c4aa4cca5
parent 04aa498764220756b6d39888ed136e2f1bee9902
parent 956f786c6af651c77301e04b0f67635aa8c5f262

Merge "Fix not removing split record in overview after dismissed" into udc-dev

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

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 964ba9f..01d8967 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
@@ -2835,7 +2835,9 @@
                 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);
                     }
                 }