Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2eec1279 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't... 

Merge "DO NOT MERGE: Don't let previous activity wait if next activity won't be visible" into pi-dev
parents dfd3a1b8 b0de585d

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

+3 −1
Original line number Diff line number Diff line
@@ -2494,7 +2494,9 @@ class ActivityStack<T extends StackWindowController> extends ConfigurationContai 


        if (prev != null && prev != next) {

            if (!mStackSupervisor.mActivitiesWaitingForVisibleActivity.contains(prev)

                    && next != null && !next.nowVisible) {

                    && next != null && !next.nowVisible

                    && checkKeyguardVisibility(next, true /* shouldBeVisible */,

                            next.isTopRunningActivity())) {

                mStackSupervisor.mActivitiesWaitingForVisibleActivity.add(prev);

                if (DEBUG_SWITCH) Slog.v(TAG_SWITCH,

                        "Resuming top, waiting visible to hide: " + prev);