Merge "Fixed device restart caused by starting Activity under split-screen root task." into main (2417c31f) · Commits · e / os / android_frameworks_base

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;