Merge "Merge "Revert "Call preserveSurfaces when detaching children."" into rvc-dev am: 3affbe4d9f am: c3e5f8315a am: 564f07abdb" into rvc-qpr-dev-plus-aosp

1 files changed, 0 insertions, 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 508d2d477067..da45300ed318 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) {