From 956f786c6af651c77301e04b0f67635aa8c5f262 Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Mon, 19 Jun 2023 10:17:35 +0000 Subject: Fix not removing split record in overview after dismissed Add back removing the split record if the task was in the split before transition, which was removed by I1c931c2b. Fix: 287909905 Test: dismiss split screen, split thumbnail is removed in overview Change-Id: I614cf4e9c89a450a3d1f70b05c993eaea5acab7a --- .../Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 964ba9f9aa7c..01d8967c7d60 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 @@ 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); } } -- cgit v1.2.3-59-g8ed1b