am 2281e7d6: Merge "Make window mgr stack movement track activity mgr" into lmp-mr1-dev (2eb575b4) · Commits · e / os / android_frameworks_base

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

+5 −4

Original line number	Diff line number	Diff line
		@@ -480,6 +480,10 @@ final class ActivityStack {
		}
		mStacks.remove(this);
		mStacks.add(this);
		final TaskRecord task = topTask();
		if (task != null) {
		mWindowManager.moveTaskToTop(task.taskId);
		}
		}
		}

		@@ -3478,11 +3482,10 @@ final class ActivityStack {
		return;
		}

		moveToFront();

		// Shift all activities with this task up to the top
		// of the stack, keeping them in the same internal order.
		insertTaskAtTop(tr);
		moveToFront();

		if (DEBUG_TRANSITION) Slog.v(TAG, "Prepare to front transition: task=" + tr);
		if (reason != null &&
		@@ -3497,8 +3500,6 @@ final class ActivityStack {
		updateTransitLocked(AppTransition.TRANSIT_TASK_TO_FRONT, options);
		}

		mWindowManager.moveTaskToTop(tr.taskId);

		mStackSupervisor.resumeTopActivitiesLocked();
		EventLog.writeEvent(EventLogTags.AM_TASK_TO_FRONT, tr.userId, tr.taskId);

+0 −4

Original line number	Diff line number	Diff line
		@@ -2075,8 +2075,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		final TaskRecord topTask = targetStack.topTask();
		if (topTask != sourceTask) {
		targetStack.moveTaskToFrontLocked(sourceTask, r, options);
		} else {
		mWindowManager.moveTaskToTop(topTask.taskId);
		}
		if (!addingToTask && (launchFlags&Intent.FLAG_ACTIVITY_CLEAR_TOP) != 0) {
		// In this case, we are adding the activity to an existing
		@@ -2131,8 +2129,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		}
		targetStack = inTask.stack;
		targetStack.moveTaskToFrontLocked(inTask, r, options);
		targetStack.moveToFront();
		mWindowManager.moveTaskToTop(inTask.taskId);

		// Check whether we should actually launch the new activity in to the task,
		// or just reuse the current activity on top.