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

Commit cfa31a60 authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "[ActivityManager] Reset ActivityRecord's waitingVisible"

parents ee435b16 1110f554

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

+3 −0
Original line number Diff line number Diff line
@@ -1595,6 +1595,7 @@ final class ActivityStack { 
        mStackSupervisor.mGoingToSleepActivities.remove(next);

        next.sleeping = false;

        mStackSupervisor.mWaitingVisibleActivities.remove(next);

        next.waitingVisible = false;



        if (DEBUG_SWITCH) Slog.v(TAG, "Resuming " + next);
@@ -2807,6 +2808,7 @@ final class ActivityStack { 
        mStackSupervisor.mStoppingActivities.remove(r);

        mStackSupervisor.mGoingToSleepActivities.remove(r);

        mStackSupervisor.mWaitingVisibleActivities.remove(r);

        r.waitingVisible = false;

        if (mResumedActivity == r) {

            mResumedActivity = null;

        }
@@ -3007,6 +3009,7 @@ final class ActivityStack { 
        // down to the max limit while they are still waiting to finish.

        mStackSupervisor.mFinishingActivities.remove(r);

        mStackSupervisor.mWaitingVisibleActivities.remove(r);

        r.waitingVisible = false;



        // Remove any pending results.

        if (r.finishing && r.pendingResults != null) {