From 5c2488134e79136d93e068b727806907ebddf056 Mon Sep 17 00:00:00 2001 From: Chavi Weingarten Date: Fri, 17 Jul 2020 17:54:55 +0000 Subject: [PATCH] Revert "Call preserveSurfaces when detaching children." This reverts commit 9118c9b573a743a1526beb7a0de48174ee561af2. Reason for revert: b/161316231 Bug: 161316231 Test: Steps from bug Change-Id: Ieb76c99d96eb7f261a1bd2680ebf83905c2a5369 --- .../java/com/android/server/wm/WindowStateAnimator.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/services/core/java/com/android/server/wm/WindowStateAnimator.java b/services/core/java/com/android/server/wm/WindowStateAnimator.java index 508d2d477067f..da45300ed3180 100644 --- a/services/core/java/com/android/server/wm/WindowStateAnimator.java +++ b/services/core/java/com/android/server/wm/WindowStateAnimator.java @@ -1592,12 +1592,6 @@ class WindowStateAnimator { if (mSurfaceController != null) { mSurfaceController.detachChildren(); } - // If the children are detached, it means the app is exiting. We don't want to tear the - // content down too early, otherwise we could end up with a flicker. By preserving the - // current surface, we ensure the content remains on screen until the window is completely - // removed. It also ensures that the old surface is cleaned up when started again since it - // forces mSurfaceController to be set to null. - preserveSurfaceLocked(); } void setOffsetPositionForStackResize(boolean offsetPositionForStackResize) {