commit 67c807a1fead456203692fdd92526cf30ad5e1ef
author Orhan Uysal <uysalorhan@google.com> Mon May 20 10:08:33 2024 +0000
committer Orhan Uysal <uysalorhan@google.com> Tue May 21 12:42:37 2024 +0000
tree 9ef2fbd423e8a8a3a092c578f799d208851fdb51
parent 8b0d1fb614630c3ec75a1f6e58e3251be00e3de0

Fix activity leak

In some occasions, launcher leaks through DesktopVisibilityController
and SplitFromDesktopController. Set mDesktopVisibilityController and mSplitSelectStateController to null
after their onDestroy() methods are called.

Bug: 332339792
Test: m
Flag: ACONFIG com.android.window.flags.enable_desktop_windowing_mode TEAMFOOD
Change-Id: I66418f30ec5d2735f812ee6e4180f55f67d7b46f

quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java

diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 4184ab2..5ffa4b5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -533,16 +533,18 @@
         if (mDesktopVisibilityController != null) {
             mDesktopVisibilityController.unregisterSystemUiListener();
         }
+        mDesktopVisibilityController = null;
 
         if (mSplitSelectStateController != null) {
+            removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());
             mSplitSelectStateController.onDestroy();
         }
+        mSplitSelectStateController = null;
 
         super.onDestroy();
         mHotseatPredictionController.destroy();
         mSplitWithKeyboardShortcutController.onDestroy();
         if (mViewCapture != null) mViewCapture.close();
-        removeBackAnimationCallback(mSplitSelectStateController.getSplitBackHandler());
     }
 
     @Override