commit 0fd3b13d018cd66449349e6938d85d9cce6f9c2d
author Pat Manning <patmanning@google.com> Tue Apr 26 17:07:57 2022 +0100
committer Pat Manning <patmanning@google.com> Fri Apr 29 11:55:40 2022 +0000
tree d1d477f05db4a30f0b516fc4bc4e5643ac1587dd
parent 3a16087bab62ef9ea2158230e579f2e93bf771d3

Finish recents animation on activity destroyed.

Do not remove acitivity lifecycle callback on reset.

Test: TaplTestsQuickstep.java testQuickSwitchFromApp
Fix: 228137694
Change-Id: I454db1d029af479624999f2e5736aea1a8a97b87

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index b90e820..5acce89 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -163,7 +163,11 @@
                     if (mActivity != activity) {
                         return;
                     }
+                    if (mTaskAnimationManager != null) {
+                        mTaskAnimationManager.finishRunningRecentsAnimation(true);
+                    }
                     mRecentsView = null;
+                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
                     mActivity = null;
                 }
             };
@@ -1571,9 +1575,6 @@
 
     private void reset() {
         mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
-        if (mActivity != null) {
-            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
-        }
     }
 
     /**