Merge "Fix ActivityLeak for RecentsViewContiner in TaskbarManager" into main

2024-11-06 21:15:25 +00:00
parent adfd002972 dbceb92317
commit 585de4e0e9
1 changed files with 4 additions and 0 deletions
@@ -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);