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

Commit ebc440ea authored by Craig Mautner's avatar Craig Mautner Committed by android-build-merger
Browse files

am 443d1a6a: am cfa31a60: Merge "[ActivityManager] Reset ActivityRecord\'s waitingVisible" 

automerge: 3551ce9d

* commit '3551ce9d':
  [ActivityManager] Reset ActivityRecord's waitingVisible
parents aa5adac6 3551ce9d

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

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

        mStackSupervisor.mGoingToSleepActivities.remove(r);

        mStackSupervisor.mWaitingVisibleActivities.remove(r);

        r.waitingVisible = false;

        if (mResumedActivity == r) {

            mResumedActivity = null;

        }
@@ -2979,6 +2981,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) {