commit 523ba5e9a2a5d0c2d451bf4f5e33dc2c9c43b086
author Chris Craik <ccraik@google.com> Mon Oct 17 23:48:57 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 17 23:48:57 2016 +0000
tree 1b9856f912e209ec4865ad3777b05aa539456877
parent a69e6dece26df19f1d22cea5f1676528107c3c49
parent 2c9a07cdd40f47c289331c36a297a03882e6cd54

Merge "Fix a bug that the FSD should loop infinitely if the loop count from file or set by setLoopCount is 0 (or smaller)."
am: 2c9a07cdd4

Change-Id: Id0ab488b6832f963dbd6e53f50e3553494c7cc2a

framesequence/src/android/support/rastermill/FrameSequenceDrawable.java

diff --git a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
index cc17c73..d86df62 100644
--- a/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
+++ b/framesequence/src/android/support/rastermill/FrameSequenceDrawable.java
@@ -390,8 +390,8 @@
                 boolean continueLooping = true;
                 if (mNextFrameToDecode == mFrameSequence.getFrameCount() - 1) {
                     mCurrentLoop++;
-                    if ((mLoopBehavior == LOOP_FINITE && mCurrentLoop >= mLoopCount) ||
-                            (mLoopBehavior == LOOP_DEFAULT && mCurrentLoop >= mFrameSequence.getDefaultLoopCount())) {
+                    if ((mLoopBehavior == LOOP_FINITE && mCurrentLoop == mLoopCount) ||
+                            (mLoopBehavior == LOOP_DEFAULT && mCurrentLoop == mFrameSequence.getDefaultLoopCount())) {
                         continueLooping = false;
                     }
                 }