Merge "Fix potential memory leak by setting mControllers = null" into sc-v2-dev am: 96f3f2214c

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16367281

Change-Id: Iaee380e7e3ee610f0d06cbb001bf45f18c945ee6

quickstep/src/com/android/launcher3/taskbar/FallbackTaskbarUIController.java

@@ -60,6 +60,7 @@ public class FallbackTaskbarUIController extends TaskbarUIController {
 
     @Override
     protected void onDestroy() {
+        super.onDestroy();
         mRecentsActivity.setTaskbarUIController(null);
         mRecentsActivity.getStateManager().removeStateListener(mStateListener);
     }

quickstep/src/com/android/launcher3/taskbar/LauncherTaskbarUIController.java

@@ -99,6 +99,7 @@ public class LauncherTaskbarUIController extends TaskbarUIController {
 
     @Override
     protected void onDestroy() {
+        super.onDestroy();
         onLauncherResumedOrPaused(false);
         mTaskbarLauncherStateController.onDestroy();
 

quickstep/src/com/android/launcher3/taskbar/TaskbarUIController.java

@@ -18,6 +18,8 @@ package com.android.launcher3.taskbar;
 import android.graphics.Rect;
 import android.view.View;
 
+import androidx.annotation.CallSuper;
+
 import com.android.launcher3.model.data.ItemInfoWithIcon;
 import com.android.launcher3.model.data.WorkspaceItemInfo;
 
@@ -33,11 +35,15 @@ public class TaskbarUIController {
     // Initialized in init.
     protected TaskbarControllers mControllers;
 
+    @CallSuper
     protected void init(TaskbarControllers taskbarControllers) {
         mControllers = taskbarControllers;
     }
 
-    protected void onDestroy() { }
+    @CallSuper
+    protected void onDestroy() {
+        mControllers = null;
+    }
 
     protected boolean isTaskbarTouchable() {
         return true;