Merge "Revert "Prevent dismissing starting window when reopening app"" into qt-dev am: 4cd89f0332

am: 5a898bb75f

Change-Id: If44971e053525d28128d1ab40722e1b077536566

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

@@ -540,14 +540,6 @@ class AppWindowToken extends WindowToken implements WindowManagerService.AppFree
                 // If the app was already visible, don't reset the waitingToShow state.
                 if (isHidden()) {
                     waitingToShow = true;
-
-                    // Let's reset the draw state in order to prevent the starting window to be
-                    // immediately dismissed when the app still has the surface.
-                    forAllWindows(w -> {
-                            if (w.mAttrs.type != TYPE_APPLICATION_STARTING) {
-                                w.mWinAnimator.resetDrawState();
-                            }
-                        },  true /* traverseTopToBottom */);
                 }
             }