Merge "Add missing check of avoidMoveToFront when starting activity" into main (1af04b8b) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -2167,7 +2167,7 @@ class ActivityStarter {
		// We don't need to start a new activity, and the client said not to do anything
		// if that is the case, so this is it! And for paranoia, make sure we have
		// correctly resumed the top activity.
		if (!mMovedToFront && mDoResume) {
		if (!mMovedToFront && mDoResume && !avoidMoveToFront()) {
		ProtoLog.d(WM_DEBUG_TASKS, "Bring to front target: %s from %s", mTargetRootTask,
		targetTaskTop);
		mTargetRootTask.moveToFront("intentActivityFound");
		@@ -2196,7 +2196,7 @@ class ActivityStarter {
		if (mMovedToFront) {
		// We moved the task to front, use starting window to hide initial drawn delay.
		targetTaskTop.showStartingWindow(true /* taskSwitch */);
		} else if (mDoResume) {
		} else if (mDoResume && !avoidMoveToFront()) {
		// Make sure the root task and its belonging display are moved to topmost.
		mTargetRootTask.moveToFront("intentActivityFound");
		}