Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix SpringAnimation class cast exception." into tm-qpr-dev am: 5ce1b5d682

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20332766

Change-Id: I88e853ed43cba28c8ea44201d0e5b675800c7554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Yein Jo
2022-11-09 00:48:15 +00:00
committed by Automerger Merge Worker
parent 14391d46c7 5ce1b5d682
commit 7bb55bb2b6
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/android/animation/AnimationHandler.java
View File

@@ -219,12 +219,14 @@ public class AnimationHandler {
return; return;
} }
for (int i = 0; i < mAnimationCallbacks.size(); ++i) { for (int i = 0; i < mAnimationCallbacks.size(); ++i) {
Animator animator = ((Animator) mAnimationCallbacks.get(i)); AnimationFrameCallback callback = mAnimationCallbacks.get(i);
if (animator != null if (callback instanceof Animator) {
&& animator.getTotalDuration() == Animator.DURATION_INFINITE Animator animator = ((Animator) callback);
&& !animator.isPaused()) { if (animator.getTotalDuration() == Animator.DURATION_INFINITE
mPausedAnimators.add(animator); && !animator.isPaused()) {
animator.pause(); mPausedAnimators.add(animator);
animator.pause();
}
} }
} }
}; };