Merge "Wait for next app to be visible if current activity is marked visible" into nyc-dev (98afb342) · Commits · e / os / android_frameworks_base

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -3457,7 +3457,7 @@ final class ActivityStack {
		// First things first: if this activity is currently visible,
		// and the resumed activity is not yet visible, then hold off on
		// finishing until the resumed one becomes visible.
		if (mode == FINISH_AFTER_VISIBLE && r.nowVisible) {
		if (mode == FINISH_AFTER_VISIBLE && (r.visible \|\| r.nowVisible)) {
		if (!mStackSupervisor.mStoppingActivities.contains(r)) {
		addToStopping(r, false /* immediate */);
		}