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

Commit 81895251 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make the resumed activity visible"

parents 2ad7a573 be65485d

services/core/java/com/android/server/wm/ActivityRecord.java

+1 −1
Original line number Diff line number Diff line
@@ -4786,7 +4786,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A 


    void makeVisibleIfNeeded(ActivityRecord starting, boolean reportToClient) {

        // This activity is not currently visible, but is running. Tell it to become visible.

        if (mState == RESUMED || this == starting) {

        if ((mState == RESUMED && mVisibleRequested) || this == starting) {

            if (DEBUG_VISIBILITY) Slog.d(TAG_VISIBILITY,

                    "Not making visible, r=" + this + " state=" + mState + " starting=" + starting);

            return;

services/core/java/com/android/server/wm/Task.java

+0 −2
Original line number Diff line number Diff line
@@ -6052,8 +6052,6 @@ class Task extends WindowContainer<WindowContainer> { 
        // If the top activity is the resumed one, nothing to do.

        if (mResumedActivity == next && next.isState(RESUMED)

                && taskDisplayArea.allResumedActivitiesComplete()) {

            // The activity may be waiting for stop, but that is no longer appropriate for it.

            mTaskSupervisor.mStoppingActivities.remove(next);

            // Make sure we have executed any pending transitions, since there

            // should be nothing left to do at this point.

            executeAppTransition(options);