commit f03de653c7fbc4cfa2d40525c05c743b0531c5a0
author Kai Peng <justkoomega@gmail.com> Thu Dec 28 04:30:37 2023 +0000
committer Kai Peng <justkoomega@gmail.com> Thu Dec 28 04:30:53 2023 +0000
tree 396c9ea416bf2f42bfbffd847264d96d54e15624
parent 84a49337e48d1ca16642e5559caac5ca6b2c8203

TaskId=0 is also a valid task id, should not be passed to valueIfKeyNotFound.

When the user 0 exhausts all the MAX_TASK_IDS_PER_USER, the Task#0 is reused. But Task#0 may not be in the split pair.

Change-Id: Ie084deb579d7a3d0e1c1d823f9d1266af7243fdb

libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java
index f35eda6..63ca6a5 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java
@@ -336,7 +336,7 @@
                 continue;
             }
 
-            final int pairedTaskId = mSplitTasks.get(taskInfo.taskId);
+            final int pairedTaskId = mSplitTasks.get(taskInfo.taskId, INVALID_TASK_ID);
             if (pairedTaskId != INVALID_TASK_ID && rawMapping.contains(
                     pairedTaskId)) {
                 final ActivityManager.RecentTaskInfo pairedTaskInfo = rawMapping.get(pairedTaskId);