Merge "Move activity to display on launch" into oc-dev (33d986d9) · Commits · e / os / android_frameworks_base

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

+14 −0

Original line number	Diff line number	Diff line
		@@ -1465,6 +1465,12 @@ class ActivityStarter {
		return intentActivity;
		}

		/**
		* Figure out which task and activity to bring to front when we have found an existing matching
		* activity record in history. May also clear the task if needed.
		* @param intentActivity Existing matching activity.
		* @return {@link ActivityRecord} brought to front.
		*/
		private ActivityRecord setTargetStackAndMoveToFrontIfNeeded(ActivityRecord intentActivity) {
		mTargetStack = intentActivity.getStack();
		mTargetStack.mLastPausedActivity = null;
		@@ -1526,6 +1532,14 @@ class ActivityStarter {
		"bringToFrontInsteadOfAdjacentLaunch");
		}
		mMovedToFront = true;
		} else if (launchStack.mDisplayId != mTargetStack.mDisplayId) {
		// Target and computed stacks are on different displays and we've
		// found a matching task - move the existing instance to that display and
		// move it to front.
		intentActivity.task.reparent(launchStack.mStackId, ON_TOP,
		REPARENT_MOVE_STACK_TO_FRONT, ANIMATE, DEFER_RESUME,
		"reparentToDisplay");
		mMovedToFront = true;
		}
		mOptions = null;