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

2017-05-09 18:31:48 +00:00
parent 2719c3bf70 cb956050d5
commit b55403008f
1 changed files with 1 additions and 3 deletions
--- a/services/core/java/com/android/server/am/ActivityRecord.java
+++ b/services/core/java/com/android/server/am/ActivityRecord.java
@@ -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();