Merge "Fix crash in AnimationDrawable" into lmp-dev

2014-08-18 22:03:20 +00:00
parent 71809ee7f6 030435773d
commit 32e966ccb3
1 changed files with 3 additions and 1 deletions
--- a/graphics/java/android/graphics/drawable/AnimationDrawable.java
+++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java
@@ -114,7 +114,9 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An
        final boolean changed = super.setVisible(visible, restart);
        if (visible) {
            if (restart || changed) {
-                setFrame(restart ? 0 : mCurFrame, true, mAnimating);
+                boolean startFromZero = restart || mCurFrame < 0 ||
+                        mCurFrame >= mAnimationState.getChildCount();
+                setFrame(startFromZero ? 0 : mCurFrame, true, mAnimating);
            }
        } else {
            unscheduleSelf(this);