From 48bd8685990a7054a605a63c7b2ee6ff02a80508 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Tue, 25 Jun 2019 17:26:49 +0200 Subject: [PATCH] Revert "Reland "Prevent dismissing starting window when reopening app"" This reverts commit be71ed8a8e2ea302abbd4a5a0e8b5adc53449e67. Causes various issues. Out of time for Q to investigate and fix. Fixes: 135706138 Fixes: 135661232 Fixes: 135976008 Fixes: 135921478 Fixes: 135780312 Bug: 134561008 Change-Id: Ifb7b1fe2b189649d320516e70368625c903debea --- .../core/java/com/android/server/wm/AppWindowToken.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index be3b924aaeb7e..918927912c0b2 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -79,7 +79,6 @@ import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_NORMAL; import static com.android.server.wm.WindowManagerService.UPDATE_FOCUS_WILL_PLACE_SURFACES; import static com.android.server.wm.WindowManagerService.logWithStack; import static com.android.server.wm.WindowState.LEGACY_POLICY_VISIBILITY; -import static com.android.server.wm.WindowStateAnimator.HAS_DRAWN; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_AFTER_ANIM; import static com.android.server.wm.WindowStateAnimator.STACK_CLIP_BEFORE_ANIM; @@ -541,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.mWinAnimator.mDrawState == HAS_DRAWN) { - w.mWinAnimator.resetDrawState(); - } - }, true /* traverseTopToBottom */); } }