From 6e814f9f3356cd56623c47ec50e2a84ec6bc10be Mon Sep 17 00:00:00 2001 From: Elisa Pascual Trevino Date: Wed, 12 Jun 2019 22:10:23 +0000 Subject: [PATCH] Revert "Prevent dismissing starting window when reopening app" This reverts commit 7c88cf83035e331bb4c4ccb519c8200f2e9d083f. Original bug: b/134561008 Reason for revert: b/135084202 Change-Id: Ib4c17f98d66c9efb10d800d9ba585d14be4ac878 --- .../core/java/com/android/server/wm/AppWindowToken.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java index 912d5c4a66a55..cae7612e0fcc2 100644 --- a/services/core/java/com/android/server/wm/AppWindowToken.java +++ b/services/core/java/com/android/server/wm/AppWindowToken.java @@ -539,14 +539,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 */); } }