Merge "Revert "Defer stop for all activities becoming invisible"" into pi-dev

am: b2dac061bb

Change-Id: Iacab2fc896a9fb7a8313926b0f6dfc5355d468a2
This commit is contained in:
Winson Chung
2018-06-12 00:12:28 -07:00
committed by android-build-merger

View File

@@ -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