[automerger] Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev am: b2dac061bb am: 5d0c692fc8

Change-Id: I1498fe2942980126a28794c82035b54f234365a2
This commit is contained in:
Android Build Merger (Role)
2018-06-12 07:13:11 +00:00

View File

@@ -1654,13 +1654,6 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai
void addToStopping(ActivityRecord r, boolean scheduleIdle, boolean idleDelayed) {
if (!mStackSupervisor.mStoppingActivities.contains(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