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

Commit e76abe85 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge \\"Allow no longer waiting for visible activity to be stopped.\\" into... 

Merge \\"Allow no longer waiting for visible activity to be stopped.\\" into nyc-mr1-dev am: 5ac1b52a
am: a561d28b

Change-Id: I471dd78e6a06f1bfd45f7d59c4bbe4efaa518561
parents bb3a0004 a561d28b

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

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

        final boolean nowVisible = allResumedActivitiesVisible();

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

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

            ActivityRecord s = mStoppingActivities.get(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

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

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

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

            if (waitingVisible && nowVisible) {

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

                    // hidden by the activities in front of it.

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

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

                    mWindowManager.setAppVisibility(s.appToken, false);

                    mWindowManager.setAppVisibility(s.appToken, false);

                    waitingVisible = false;

                }

                }

            }

            }

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

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