Snap for 8756258 from ed2e7719cb to tm-release

Change-Id: Ie0597a75aa07d54a2e64e26f151b73fae4cd5a8d
2022-06-22 23:24:09 +00:00
parent 2719b17206 ed2e7719cb
commit f2ccf486cd
1 changed files with 3 additions and 4 deletions
@@ -166,11 +166,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;
                }
            };
@@ -1599,6 +1595,9 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,

    private void reset() {
        mStateCallback.setStateOnUiThread(STATE_HANDLER_INVALIDATED);
+        if (mActivity != null) {
+            mActivity.unregisterActivityLifecycleCallbacks(mLifecycleCallbacks);
+        }
    }

    /**