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

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

Merge "Allow no longer waiting for visible activity to be stopped." into nyc-mr1-dev

parents 327c7e4c 3c519307

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

+2 −1
Original line number Diff line number Diff line
@@ -3074,7 +3074,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
        final boolean nowVisible = allResumedActivitiesVisible();

        for (int activityNdx = mStoppingActivities.size() - 1; activityNdx >= 0; --activityNdx) {

            ActivityRecord s = mStoppingActivities.get(activityNdx);

            final boolean waitingVisible = mWaitingVisibleActivities.contains(s);

            boolean waitingVisible = mWaitingVisibleActivities.contains(s);

            if (DEBUG_STATES) Slog.v(TAG, "Stopping " + s + ": nowVisible=" + nowVisible

                    + " waitingVisible=" + waitingVisible + " finishing=" + s.finishing);

            if (waitingVisible && nowVisible) {
@@ -3087,6 +3087,7 @@ public final class ActivityStackSupervisor implements DisplayListener { 
                    // hidden by the activities in front of it.

                    if (DEBUG_STATES) Slog.v(TAG, "Before stopping, can hide: " + s);

                    mWindowManager.setAppVisibility(s.appToken, false);

                    waitingVisible = false;

                }

            }

            if ((!waitingVisible || mService.isSleepingOrShuttingDownLocked()) && remove) {