Merge "Prioritize reused activity's stack over computed stack." into oc-dev am: ac56b8adde (014d0ebc) · Commits · e / os / android_frameworks_base

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

+4 −5

Original line number	Diff line number	Diff line
		@@ -2083,6 +2083,10 @@ class ActivityStarter {

		private ActivityStack getLaunchStack(ActivityRecord r, int launchFlags, TaskRecord task,
		ActivityOptions aOptions) {
		// We are reusing a task, keep the stack!
		if (mReuseTask != null) {
		return mReuseTask.getStack();
		}

		// If the activity is of a specific type, return the associated stack, creating it if
		// necessary
		@@ -2096,11 +2100,6 @@ class ActivityStarter {
		return mSupervisor.getStack(ASSISTANT_STACK_ID, CREATE_IF_NEEDED, ON_TOP);
		}

		// We are reusing a task, keep the stack!
		if (mReuseTask != null) {
		return mReuseTask.getStack();
		}

		final int launchDisplayId =
		(aOptions != null) ? aOptions.getLaunchDisplayId() : INVALID_DISPLAY;