Merge "Fix stopping activity when removed from waiting visible" into nyc-mr1-dev (3904e1bc) · Commits · e / os / android_frameworks_base

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -3139,11 +3139,14 @@ public final class ActivityStackSupervisor implements DisplayListener {
		final boolean nowVisible = allResumedActivitiesVisible();
		for (int activityNdx = mStoppingActivities.size() - 1; activityNdx >= 0; --activityNdx) {
		ActivityRecord s = mStoppingActivities.get(activityNdx);
		// TODO: Remove mWaitingVisibleActivities list and just remove activity from
		// mStoppingActivities when something else comes up.
		boolean waitingVisible = mWaitingVisibleActivities.contains(s);
		if (DEBUG_STATES) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + nowVisible
		+ " waitingVisible=" + waitingVisible + " finishing=" + s.finishing);
		if (waitingVisible && nowVisible) {
		mWaitingVisibleActivities.remove(s);
		waitingVisible = false;
		if (s.finishing) {
		// If this activity is finishing, it is sitting on top of
		// everyone else but we now know it is no longer needed...
		@@ -3152,7 +3155,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
		// hidden by the activities in front of it.
		if (DEBUG_STATES) Slog.v(TAG, "Before stopping, can hide: " + s);
		mWindowManager.setAppVisibility(s.appToken, false);
		waitingVisible = false;
		}
		}
		if ((!waitingVisible \|\| mService.isSleepingOrShuttingDownLocked()) && remove) {