Merge "Revert "Avoid creating new instance on top when started for resu..."" (04120f34) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Diff line number	Diff line
		@@ -1821,7 +1821,7 @@ class ActivityStarter {
		*/
		private int deliverToCurrentTopIfNeeded(ActivityStack topStack) {
		final ActivityRecord top = topStack.topRunningNonDelayedActivityLocked(mNotTop);
		final boolean dontStart = top != null
		final boolean dontStart = top != null && mStartActivity.resultTo == null
		&& top.mActivityComponent.equals(mStartActivity.mActivityComponent)
		&& top.mUserId == mStartActivity.mUserId
		&& top.attachedToProcess()
		@@ -2057,6 +2057,8 @@ class ActivityStarter {
		&& !isLaunchModeOneOf(LAUNCH_SINGLE_TASK, LAUNCH_SINGLE_INSTANCE)
		&& (mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0;

		sendNewTaskResultRequestIfNeeded();

		if ((mLaunchFlags & FLAG_ACTIVITY_NEW_DOCUMENT) != 0 && r.resultTo == null) {
		mLaunchFlags \|= FLAG_ACTIVITY_NEW_TASK;
		}
		@@ -2238,8 +2240,6 @@ class ActivityStarter {
		mLaunchFlags \|= FLAG_ACTIVITY_NEW_TASK;
		}
		}

		sendNewTaskResultRequestIfNeeded();
		}

		private void computeSourceStack() {