Merge "[ActivityManager] Avoid improper resume top activity." (e4d4e22f) · Commits · e / os / android_frameworks_base

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

+7 −11

Original line number	Diff line number	Diff line
		@@ -4592,19 +4592,15 @@ public final class ActivityManagerService extends ActivityManagerNative
		finishInstrumentationLocked(app, Activity.RESULT_CANCELED, info);
		}

		if (!restarting) {
		if (!mStackSupervisor.resumeTopActivitiesLocked()) {
		if (!restarting && hasVisibleActivities && !mStackSupervisor.resumeTopActivitiesLocked()) {
		// If there was nothing to resume, and we are not already
		// restarting this process, but there is a visible activity that
		// is hosted by the process... then make sure all visible
		// activities are running, taking care of restarting this
		// process.
		if (hasVisibleActivities) {
		mStackSupervisor.ensureActivitiesVisibleLocked(null, 0);
		}
		}
		}
		}

		private final int getLRURecordIndexForAppLocked(IApplicationThread thread) {
		IBinder threadBinder = thread.asBinder();

+3 −3

Original line number	Diff line number	Diff line
		@@ -3390,6 +3390,9 @@ final class ActivityStack {
		if (DEBUG_CLEANUP) Slog.v(
		TAG, "Record #" + i + " " + r + ": app=" + r.app);
		if (r.app == app) {
		if (r.visible) {
		hasVisibleActivities = true;
		}
		boolean remove;
		if ((!r.haveState && !r.stateNotNeeded) \|\| r.finishing) {
		// Don't currently have state for the activity, or
		@@ -3431,9 +3434,6 @@ final class ActivityStack {
		// it can be restarted later when needed.
		if (localLOGV) Slog.v(
		TAG, "Keeping entry, setting app to null");
		if (r.visible) {
		hasVisibleActivities = true;
		}
		if (DEBUG_APP) Slog.v(TAG, "Clearing app during removeHistory for activity "
		+ r);
		r.app = null;