Merge "Fix infinite AVD not running" into nyc-mr1-dev

2016-08-08 21:03:51 +00:00
parent 67abc837af 18e08a0170
commit a5dc817c75
1 changed files with 1 additions and 1 deletions
--- a/libs/hwui/PropertyValuesAnimatorSet.cpp
+++ b/libs/hwui/PropertyValuesAnimatorSet.cpp
@@ -156,7 +156,7 @@ void PropertyAnimator::setFraction(float fraction, long iteration) {
    // This makes sure we only set the fraction = repeatCount + 1 once. It is needed because there
    // might be another animator modifying the same property after this animator finishes, we need
    // to make sure we don't set conflicting values on the same property within one frame.
-    if ((mLatestFraction == mRepeatCount + 1) && (totalFraction >= mRepeatCount + 1)) {
+    if ((mLatestFraction == mRepeatCount + 1.0) && (totalFraction >= mRepeatCount + 1.0)) {
        return;
    }