Merge "Defer resuming when creating home stack for starting home" (c2c33d4e) · Commits · e / os / android_frameworks_base

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -182,9 +182,17 @@ public class ActivityStartController {

		final ActivityDisplay display =
		mService.mRootActivityContainer.getActivityDisplay(displayId);
		// The home activity will be started later, defer resuming to avoid unneccerary operations
		// (e.g. start home recursively) when creating home stack.
		mSupervisor.beginDeferResume();
		final ActivityStack homeStack;
		try {
		// Make sure home stack exist on display.
		final ActivityStack homeStack =
		display.getOrCreateStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME, ON_TOP);
		homeStack = display.getOrCreateStack(WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_HOME,
		ON_TOP);
		} finally {
		mSupervisor.endDeferResume();
		}

		mLastHomeActivityStartResult = obtainStarter(intent, "startHomeActivity: " + reason)
		.setOutActivity(tmpOutRecord)

+3 −0

Original line number	Diff line number	Diff line
		@@ -1156,6 +1156,9 @@ class RootActivityContainer extends ConfigurationContainer
		final ActivityStack focusedStack = display.getFocusedStack();
		if (focusedStack != null) {
		result \|= focusedStack.resumeTopActivityUncheckedLocked(target, targetOptions);
		} else if (targetStack == null && !display.hasChild()) {
		result \|= resumeHomeActivity(null /* prev */, "empty-display",
		display.mDisplayId);
		}
		}
		}