commit 806a9f13682867b0e5a4cb62b4b6a6d54ee51d02
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed Mar 05 05:30:51 2025 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 05 05:30:51 2025 -0800
tree e7cdbe4dcefb6fb454b0d56eba23b9a676bea10a
parent d3a0c94067ed3e860f24852b0e00b3f51933b23d
parent 0d3cc4e75ab2749653a448e63a7361b01b4dda03

Merge "Use the safe `getDisplayId()` API when building the recents desktop task list." into main

quickstep/src/com/android/quickstep/RecentTasksList.java

diff --git a/quickstep/src/com/android/quickstep/RecentTasksList.java b/quickstep/src/com/android/quickstep/RecentTasksList.java
index f506039..ac88e5a 100644
--- a/quickstep/src/com/android/quickstep/RecentTasksList.java
+++ b/quickstep/src/com/android/quickstep/RecentTasksList.java
@@ -41,6 +41,7 @@
 import com.android.launcher3.util.LooperExecutor;
 import com.android.launcher3.util.SplitConfigurationOptions;
 import com.android.quickstep.util.DesktopTask;
+import com.android.quickstep.util.ExternalDisplaysKt;
 import com.android.quickstep.util.GroupTask;
 import com.android.quickstep.util.SingleTask;
 import com.android.quickstep.util.SplitTask;
@@ -460,7 +461,8 @@
             Map<Integer, List<Task>> perDisplayTasks = new HashMap<>();
             for (TaskInfo taskInfo : recentTaskInfo.getTaskInfoList()) {
                 Task task = createTask(taskInfo, minimizedTaskIds);
-                List<Task> tasks = perDisplayTasks.computeIfAbsent(taskInfo.displayId,
+                List<Task> tasks = perDisplayTasks.computeIfAbsent(
+                        ExternalDisplaysKt.getDisplayId(task),
                         k -> new ArrayList<>());
                 tasks.add(task);
             }