commit f38d739130eaee4542a0fd7dfb0f12fd56989fc3
author Orhan Uysal <uysalorhan@google.com> Tue May 28 12:10:40 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 28 12:10:40 2024 +0000
tree 7010725bd9c46559b5b7983ff10a477dedc830ef
parent 1b973c068d78677714c774dab7e35ac82ba3cdf2
parent e0e54600662ae5370a2a0419e3445ee68befe1bf

Merge "Revert "Fix activity leak"" into main

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 dc22390..046dbd5 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -542,18 +542,16 @@
         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