Merge "When removing a task that was on home, put home on top." into klp-dev (166434ec) · Commits · e / os / android_frameworks_base

services/java/com/android/server/am/ActivityManagerService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -3466,7 +3466,7 @@ public final class ActivityManagerService extends ActivityManagerNative
		}

		// Remove this application's activities from active lists.
		boolean hasVisibleActivities = mStackSupervisor.handleAppDiedLocked(app, restarting);
		boolean hasVisibleActivities = mStackSupervisor.handleAppDiedLocked(app);

		app.activities.clear();

+3 −0

Original line number	Diff line number	Diff line
		@@ -2629,6 +2629,9 @@ final class ActivityStack {
		if (DEBUG_STACK) Slog.i(TAG,
		"removeActivityFromHistoryLocked: last activity removed from " + this);
		mStackSupervisor.removeTask(task);
		if (task.mOnTopOfHome) {
		mStackSupervisor.moveHomeToTop();
		}
		}
		r.takeFromHistory();
		removeTimeoutsForActivityLocked(r);

+8 −4

Original line number	Diff line number	Diff line
		@@ -278,12 +278,16 @@ public final class ActivityStackSupervisor {
		}
		}

		boolean resumeHomeActivity(ActivityRecord prev) {
		void moveHomeToTop() {
		moveHomeStack(true);
		mHomeStack.moveHomeTaskToTop();
		}

		boolean resumeHomeActivity(ActivityRecord prev) {
		moveHomeToTop();
		if (prev != null) {
		prev.task.mOnTopOfHome = false;
		}
		mHomeStack.moveHomeTaskToTop();
		ActivityRecord r = mHomeStack.topRunningActivityLocked(null);
		if (r != null && r.isHomeActivity()) {
		mService.setFocusedActivityLocked(r);
		@@ -625,7 +629,7 @@ public final class ActivityStackSupervisor {
		}

		void startHomeActivity(Intent intent, ActivityInfo aInfo) {
		moveHomeStack(true);
		moveHomeToTop();
		startActivityLocked(null, intent, null, aInfo, null, null, 0, 0, 0, null, 0,
		null, false, null);
		}
		@@ -1906,7 +1910,7 @@ public final class ActivityStackSupervisor {
		return r;
		}

		boolean handleAppDiedLocked(ProcessRecord app, boolean restarting) {
		boolean handleAppDiedLocked(ProcessRecord app) {
		boolean hasVisibleActivities = false;
		for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
		hasVisibleActivities \|= mStacks.get(stackNdx).handleAppDiedLocked(app);