Merge "Move home task to front when home stack is moved to front." (58f68b56) · Commits · e / os / android_frameworks_base

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

+3 −2

Original line number	Diff line number	Diff line
		@@ -464,7 +464,7 @@ public final class ActivityStackSupervisor implements DisplayListener {

		mHomeStack.moveHomeStackTaskToTop(homeStackTaskType);

		final ActivityRecord top = mHomeStack.topRunningActivityLocked(null);
		final ActivityRecord top = getHomeActivity();
		if (top == null) {
		return false;
		}
		@@ -487,7 +487,8 @@ public final class ActivityStackSupervisor implements DisplayListener {
		prev.task.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE);
		}

		ActivityRecord r = mHomeStack.topRunningActivityLocked(null);
		mHomeStack.moveHomeStackTaskToTop(homeStackTaskType);
		ActivityRecord r = getHomeActivity();
		if (r != null) {
		mService.setFocusedActivityLocked(r, reason);
		return resumeTopActivitiesLocked(mHomeStack, prev, null);

+2 −4

Original line number	Diff line number	Diff line
		@@ -385,10 +385,8 @@ final class TaskRecord {
		}

		void setTaskToReturnTo(int taskToReturnTo) {
		if (IGNORE_RETURN_TO_RECENTS && taskToReturnTo == RECENTS_ACTIVITY_TYPE) {
		taskToReturnTo = HOME_ACTIVITY_TYPE;
		}
		mTaskToReturnTo = taskToReturnTo;
		mTaskToReturnTo = (IGNORE_RETURN_TO_RECENTS && taskToReturnTo == RECENTS_ACTIVITY_TYPE)
		? HOME_ACTIVITY_TYPE : taskToReturnTo;
		}

		int getTaskToReturnTo() {