From dbceb923171118327f9037fc3237ae273953b19a Mon Sep 17 00:00:00 2001
From: Jagrut Desai <jagrutdesai@google.com>
Date: Tue, 5 Nov 2024 16:38:53 -0800
Subject: [PATCH] Fix ActivityLeak for RecentsViewContiner in TaskbarManager

Test: presubmit
Bug: 376763663
Flag: EXEMPT TEST_ONLY
Change-Id: I9724e9d91e9ab1a414ce2fbcb6a618b5b23f7ab1
---
 .../src/com/android/launcher3/taskbar/TaskbarManager.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
index ab4b1b6b5a..a8ffc5e9ae 100644
--- a/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
+++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarManager.java
@@ -175,6 +175,9 @@ public class TaskbarManager {
                                 + "onActivityDestroyed.");
                 mActivity.removeEventCallback(EVENT_DESTROYED, this);
             }
+            if (mActivity == mRecentsViewContainer) {
+                mRecentsViewContainer = null;
+            }
             mActivity = null;
             debugWhyTaskbarNotDestroyed("clearActivity");
             if (mTaskbarActivityContext != null) {
@@ -659,6 +662,7 @@ public class TaskbarManager {
      * Called when the manager is no longer needed
      */
     public void destroy() {
+        mRecentsViewContainer = null;
         debugWhyTaskbarNotDestroyed("TaskbarManager#destroy()");
         removeActivityCallbacksAndListeners();
         mTaskbarBroadcastReceiver.unregisterReceiverSafely(mContext);