commit f2ccf486cd82b80ef3f58a72597ea2af5e9bd36b
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 22 23:24:09 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Jun 22 23:24:09 2022 +0000
tree 64326e16c5ba3f1c1e6d81433bd67032349082bd
parent 2719b172068ef297a4296500c4bd2acc12771f6d
parent ed2e7719cb53dcbfa5110d46076b255749009225

Snap for 8756258 from ed2e7719cb53dcbfa5110d46076b255749009225 to tm-release

Change-Id: Ie0597a75aa07d54a2e64e26f151b73fae4cd5a8d

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 d676f7d..76f7718 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -166,11 +166,7 @@
                     if (mActivity != activity) {
                         return;
                     }
-                    if (mTaskAnimationManager != null) {
-                        mTaskAnimationManager.finishRunningRecentsAnimation(true);
-                    }
                     mRecentsView = null;
-                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
                     mActivity = null;
                 }
             };
@@ -1599,6 +1595,9 @@
 
     private void reset() {
         mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
+        if (mActivity != null) {
+            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
+        }
     }
 
     /**