From 3daaad849891d452b4d1d5d26ba84b80fa3d69ac Mon Sep 17 00:00:00 2001
From: Fengjiang Li <fengjial@google.com>
Date: Mon, 25 Nov 2024 11:24:22 -0800
Subject: [PATCH] [Launcher Memory Leak] Avoid leaking Folder/FolderIcon when
 removing FolderIcon from TaskbarView

Fix: 380868830
Flag: NONE - released code
Test: Presubmit
Change-Id: I57c179384df06015a7e95a173c399cfcda236e46
---
 quickstep/src/com/android/launcher3/taskbar/TaskbarView.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
index 8816a6dd00..e4e71874a7 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarView.java
@@ -359,6 +359,10 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
         if (!(view.getTag() instanceof CollectionInfo)) {
             mActivityContext.getViewCache().recycleView(view.getSourceLayoutResId(), view);
         }
+        if (view instanceof FolderIcon fi) {
+            // We should clear FolderInfo's Folder and FolderIcon to avoid memory leak.
+            fi.removeListeners();
+        }
         view.setTag(null);
     }