Merge "Cancel the stash animation if the stash controller is destroyed before then" into main

2024-09-11 21:01:36 +00:00
parent 8f8932b0f8 acea86234a
commit 072d2e46b6
1 changed files with 6 additions and 0 deletions
@@ -1183,6 +1183,12 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
     * Clean up on destroy from TaskbarControllers
     */
    public void onDestroy() {
+        // If the controller is destroyed before the animation finishes, we cancel the animation
+        // so that we don't finish the CUJ.
+        if (mAnimator != null) {
+            mAnimator.cancel();
+            mAnimator = null;
+        }
        UI_HELPER_EXECUTOR.execute(
                () -> mAccessibilityManager.unregisterSystemAction(SYSTEM_ACTION_ID_TASKBAR));
    }