From cbf8798bcfe021368d62601b4e3c9c4c8154b99f Mon Sep 17 00:00:00 2001
From: wilsonshih <wilsonshih@google.com>
Date: Fri, 13 Aug 2021 20:41:23 +0800
Subject: [PATCH] Release the child layer on TaskSnapshot

Try to eliminante the offscreen layer from TaskSnapshot. When remove
the task snapshot window, although the SurfaceControl has destroyed in
WindowManager, but that layer seems still left as offscreen layer in
SurfaceFlinger, a possible reason is there didn't release the copied
layer so that reference keep it alive.

Test: keep hot launch apps and monitor no TaskSnapshot layer left in
offscreen layer.
Bug: 192298258

Change-Id: I6beff78112da2309d4825e185bd960974892f5e8
---
 .../android/wm/shell/startingsurface/TaskSnapshotWindow.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java
index 7d011e6521a2c..592c03cf393b2 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/TaskSnapshotWindow.java
@@ -364,6 +364,7 @@ public class TaskSnapshotWindow {
 
         // In case window manager leaks us, make sure we don't retain the snapshot.
         mSnapshot = null;
+        mSurfaceControl.release();
     }
 
     private void drawSizeMatchSnapshot() {
@@ -431,6 +432,7 @@ public class TaskSnapshotWindow {
             mTransaction.setBuffer(mSurfaceControl, background);
         }
         mTransaction.apply();
+        childSurfaceControl.release();
     }
 
     /**