Commit b66fb491 authored May 20, 2024 by Treehugger Robot Committed by Automerger Merge Worker May 20, 2024

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 am: cc00e10c

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

Change-Id: I07b8f6452c42b1ab2fe8db8212b7a26ccf0ea5cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -2732,7 +2732,7 @@ class ActivityStarter {
		// If a target task is specified, try to reuse that one
		if (mOptions != null && mOptions.getLaunchTaskId() != INVALID_TASK_ID) {
		Task launchTask = mRootWindowContainer.anyTaskForId(mOptions.getLaunchTaskId());
		if (launchTask != null) {
		if (launchTask != null && launchTask.isLeafTask()) {
		return launchTask;
		}
		return null;