diff options
| author | 2023-12-28 13:18:46 +0000 | |
|---|---|---|
| committer | 2023-12-28 13:18:46 +0000 | |
| commit | 3a17bfc352265bfdfc246aa488605a16a73485d0 (patch) | |
| tree | 9ad9b662de5aca71e6114d592db04d0e1a7d34b9 | |
| parent | 34abff48e8b0c62ecc829c5719de22bd78d09d38 (diff) | |
| parent | 868b1dd8a5f124a7510209932ae63db3c47347c9 (diff) | |
Merge "TaskId=0 is also a valid task id, should not be passed to valueIfKeyNotFound." into main am: c93563c1c1 am: 868b1dd8a5
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2891434
Change-Id: I036fe76f31892a2718e749a33bc2598f1e9db540
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/recents/RecentTasksController.java | 2 |
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); |