commit d44f9c9741e36cbf1915306122242c9c27e7aa1c
author Pat Manning <patmanning@google.com> Fri Apr 29 17:43:21 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 29 17:43:21 2022 +0000
tree a14dbebefbee79ff07a926b85cda47907d0828b6
parent 828875cd12c27c7a027bcbf158335bf1616e3628
parent 0fd3b13d018cd66449349e6938d85d9cce6f9c2d

Merge "Finish recents animation on activity destroyed." into tm-dev

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);
-        }
     }
 
     /**