Merge "Prevent receive extra callbacks from AnimatorListener." into sc-v2-dev am: 26f39bdc52 am: e77d0a178c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16115981 Change-Id: Ia7b81c38b8968e7a08bbdd8b645dcb2a0cb75508
2021-10-26 05:33:02 +00:00
parent 323603a3c1 e77d0a178c
commit fe3fd370cb
1 changed files with 1 additions and 1 deletions
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/startingsurface/SplashscreenIconDrawableFactory.java
@@ -314,7 +314,7 @@ public class SplashscreenIconDrawableFactory {

        @Override
        public void stopAnimation() {
-            if (mIconAnimator != null) {
+            if (mIconAnimator != null && mIconAnimator.isRunning()) {
                mIconAnimator.end();
            }
        }