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

Commit cc00e10c authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed device restart caused by starting Activity under split-screen... 

Merge "Fixed device restart caused by starting Activity under split-screen root task." into main am: 2417c31f

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



Change-Id: I838b3571cf0c7acc60d0d568707bf957241e3649
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 47aacc8c 2417c31f

services/core/java/com/android/server/wm/ActivityStarter.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -2643,7 +2643,7 @@ class ActivityStarter { 
        // If a target task is specified, try to reuse that one

        // If a target task is specified, try to reuse that one

        if (mOptions != null && mOptions.getLaunchTaskId() != INVALID_TASK_ID) {

        if (mOptions != null && mOptions.getLaunchTaskId() != INVALID_TASK_ID) {

            Task launchTask = mRootWindowContainer.anyTaskForId(mOptions.getLaunchTaskId());

            Task launchTask = mRootWindowContainer.anyTaskForId(mOptions.getLaunchTaskId());

            if (launchTask != null) {

            if (launchTask != null && launchTask.isLeafTask()) {

                return launchTask;

                return launchTask;

            }

            }

            return null;

            return null;