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

Commit 6321b1cb authored by louis_chang's avatar louis_chang Committed by Steve Kondik
Browse files

[ActivityManager] Reset ActivityRecord's waitingVisible 

Symptom:
The ActivityRecord's waitingVisible is not set to false for
all cases when the ActivityRecord is removed from
mStackSupervisor.mWaitingVisibleActivities.

Solution:
Set the waitingVisible to false when it is removed from
mStackSupervisor.mWaitingVisibleActivities

Change-Id: If0f0683971d70a6866b0167e91dd95feebaac178
parent 857bece2

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

+3 −0
Original line number Diff line number Diff line
@@ -1601,6 +1601,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);
@@ -2841,6 +2842,7 @@ final class ActivityStack { 
        mStackSupervisor.mStoppingActivities.remove(r);

        mStackSupervisor.mGoingToSleepActivities.remove(r);

        mStackSupervisor.mWaitingVisibleActivities.remove(r);

        r.waitingVisible = false;

        if (mResumedActivity == r) {

            mResumedActivity = null;

        }
@@ -3041,6 +3043,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) {