diff options
| -rw-r--r-- | core/java/android/animation/AnimationHandler.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/java/android/animation/AnimationHandler.java b/core/java/android/animation/AnimationHandler.java index 1403ba2744b3..dcabf57cb8a9 100644 --- a/core/java/android/animation/AnimationHandler.java +++ b/core/java/android/animation/AnimationHandler.java @@ -219,12 +219,14 @@ public class AnimationHandler { return; } for (int i = 0; i < mAnimationCallbacks.size(); ++i) { - Animator animator = ((Animator) mAnimationCallbacks.get(i)); - if (animator != null - && animator.getTotalDuration() == Animator.DURATION_INFINITE - && !animator.isPaused()) { - mPausedAnimators.add(animator); - animator.pause(); + AnimationFrameCallback callback = mAnimationCallbacks.get(i); + if (callback instanceof Animator) { + Animator animator = ((Animator) callback); + if (animator.getTotalDuration() == Animator.DURATION_INFINITE + && !animator.isPaused()) { + mPausedAnimators.add(animator); + animator.pause(); + } } } }; |