[automerger] Merge "Revert "Defer stop for all activities becoming invisible""... (d299a0bf) · Commits · e / os / android_frameworks_base

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

+0 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1654,13 +1654,6 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
	void addToStopping(ActivityRecord r, boolean scheduleIdle, boolean idleDelayed) {		void addToStopping(ActivityRecord r, boolean scheduleIdle, boolean idleDelayed) {
	if (!mStackSupervisor.mStoppingActivities.contains(r)) {		if (!mStackSupervisor.mStoppingActivities.contains(r)) {
	mStackSupervisor.mStoppingActivities.add(r);		mStackSupervisor.mStoppingActivities.add(r);

	// Some activity is waiting for another activity to become visible before it's being
	// stopped, which means that we also want to wait with stopping this one to avoid
	// flickers.
	if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.isEmpty()) {
	mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(r);
	}
	}		}

	// If we already have a few activities waiting to stop, then give up		// If we already have a few activities waiting to stop, then give up