From 506165689fb23f955a09b83bca99cfe1805a49cf Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 21 Jun 2022 17:33:01 +0000
Subject: [PATCH] Revert "Finish recents animation on activity destroyed."

This reverts commit 0fd3b13d018cd66449349e6938d85d9cce6f9c2d.

Reason for revert: b/236514960
Bug: 228137694
Bug: 230373809

Change-Id: Ifed5f2a13fda4409982d548e3212bd16c81b63bc
---
 quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
index 5acce899f9..b90e8206f7 100644
--- a/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
+++ b/quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java
@@ -163,11 +163,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
                     if (mActivity != activity) {
                         return;
                     }
-                    if (mTaskAnimationManager != null) {
-                        mTaskAnimationManager.finishRunningRecentsAnimation(true);
-                    }
                     mRecentsView = null;
-                    mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
                     mActivity = null;
                 }
             };
@@ -1575,6 +1571,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
 
     private void reset() {
         mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
+        if (mActivity != null) {
+            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
+        }
     }
 
     /**