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

Commit b6050e94 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

Merge "Always remove orphaned starting windows, no matter what the state" into... 

Merge "Always remove orphaned starting windows, no matter what the state" into oc-dev am: b5540300
am: c4f8175e

Change-Id: Ia9b658a02d605a90b0dac2bb8b1a6736b8e65808
parents 1d0a0088 c4f8175e

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

+1 −3
Original line number Diff line number Diff line
@@ -2174,9 +2174,7 @@ final class ActivityRecord extends ConfigurationContainer implements AppWindowCo 
    }



    void removeOrphanedStartingWindow(boolean behindFullscreenActivity) {

        if (state == INITIALIZING

                && mStartingWindowState == STARTING_WINDOW_SHOWN

                && behindFullscreenActivity) {

        if (mStartingWindowState == STARTING_WINDOW_SHOWN && behindFullscreenActivity) {

            if (DEBUG_VISIBILITY) Slog.w(TAG_VISIBILITY, "Found orphaned starting window " + this);

            mStartingWindowState = STARTING_WINDOW_REMOVED;

            mWindowContainerController.removeStartingWindow();