Merge "Fix cancel animation invoke callback early"

2023-02-08 04:09:51 +00:00
parent 8c60a525f1 acdcf2be37
commit f1b0ee9abd
1 changed files with 0 additions and 6 deletions
--- 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