Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a17bfc3 authored by Riddle Hsu's avatar Riddle Hsu Committed by Automerger Merge Worker
Browse files

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

Merge "TaskId=0 is also a valid task id, should not be passed to valueIfKeyNotFound." into main am: c93563c1 am: 868b1dd8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2891434



Change-Id: I036fe76f31892a2718e749a33bc2598f1e9db540
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 34abff48 868b1dd8

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

+1 −1
Original line number Diff line number Diff line
@@ -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);