From acdcf2be37184decbc599cf8c11256f5cd186f98 Mon Sep 17 00:00:00 2001
From: Arthur Hung <arthurhung@google.com>
Date: Thu, 2 Feb 2023 02:45:06 +0000
Subject: [PATCH] Fix cancel animation invoke callback early

Removed the redundant finish behavior when the cancel animation is
running.

Bug: 259608500
Test: atest BackProgressAnimatorTest
Change-Id: Iceab5439c974268d1688d0c556c76cad33716249
---
 .../com/android/wm/shell/back/CrossActivityAnimation.java   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java
index 38f1e28a62e56..da113cb579d65 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java
@@ -370,13 +370,7 @@ class CrossActivityAnimation {
 
         @Override
         public void onBackCancelled() {
-            // End the fade in animation.
             mProgressAnimator.onBackCancelled(CrossActivityAnimation.this::finishAnimation);
-            mEnteringProgressSpring.cancel();
-            mLeavingProgressSpring.cancel();
-            // TODO (b259608500): Let BackProgressAnimator could play cancel animation.
-            mProgressAnimator.reset();
-            finishAnimation();
         }
 
         @Override