From 461e09e8939d97d4c9790150083011f1ba3dc029 Mon Sep 17 00:00:00 2001
From: Chris Li <lihongyu@google.com>
Date: Sat, 21 Aug 2021 12:36:56 -0700
Subject: [PATCH] Remove SurfaceFreezer leash when unfreeze

Before, after unfreeze, the leash will not be removed until its parent
is gone, which may stay for a while. Now, it should be cleaned up
immediately.

Bug: 196173550
Test: test with demo app with ag/15559306
Change-Id: Ie21019bddbdaa6fddc351d07cc372f621ae5176e
---
 services/core/java/com/android/server/wm/SurfaceFreezer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/core/java/com/android/server/wm/SurfaceFreezer.java b/services/core/java/com/android/server/wm/SurfaceFreezer.java
index e0a791e118bb0..fce2f8da10c78 100644
--- a/services/core/java/com/android/server/wm/SurfaceFreezer.java
+++ b/services/core/java/com/android/server/wm/SurfaceFreezer.java
@@ -117,7 +117,7 @@ class SurfaceFreezer {
         SurfaceControl leash = mLeash;
         mLeash = null;
         final boolean scheduleAnim = SurfaceAnimator.removeLeash(t, mAnimatable, leash,
-                false /* destroy */);
+                true /* destroy */);
         if (scheduleAnim) {
             mWmService.scheduleAnimationLocked();
         }