summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Riddle Hsu <riddlehsu@google.com> 2023-12-28 12:20:10 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-12-28 12:20:10 +0000
commitc93563c1c180c2ac266d988f0ac5283dd6d3824a (patch)
tree396c9ea416bf2f42bfbffd847264d96d54e15624
parent84a49337e48d1ca16642e5559caac5ca6b2c8203 (diff)
parentf03de653c7fbc4cfa2d40525c05c743b0531c5a0 (diff)
Merge "TaskId=0 is also a valid task id, should not be passed to valueIfKeyNotFound." into main
-rw-r--r--libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java2
1 files changed, 1 insertions, 1 deletions
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 f35eda6caef0..63ca6a52e8bf 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 @@ public class RecentTasksController implements TaskStackListenerCallback,
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);