commit 66d48566537bd2d037e1eff919542731b93fa85c
author Doris Liu <tianliu@google.com> Mon Nov 09 14:44:35 2015 -0800
committer Doris Liu <tianliu@google.com> Mon Nov 09 14:44:35 2015 -0800
tree d53764b97179671adaa6501732d2971162016dc5
parent ce8bf86d6d6d3342d6b94c90fcfe382070127eb2

Fix animator sometimes not being ended when end() is called without start()'ing

Bug: 23713124
Change-Id: I2e00cedb9c74e14d2361579bba89d3d1dbfe4d22

core/java/android/animation/ValueAnimator.java

diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java
index 6f65889..7f9a5d3 100644
--- a/core/java/android/animation/ValueAnimator.java
+++ b/core/java/android/animation/ValueAnimator.java
@@ -955,7 +955,6 @@
         mStarted = true;
         mPaused = false;
         mRunning = false;
-        mAnimationEndRequested = false;
         AnimationHandler animationHandler = AnimationHandler.getInstance();
         animationHandler.addAnimationFrameCallback(this, (long) (mStartDelay * sDurationScale));
 
@@ -1123,6 +1122,8 @@
             Trace.asyncTraceBegin(Trace.TRACE_TAG_VIEW, getNameForTrace(),
                     System.identityHashCode(this));
         }
+
+        mAnimationEndRequested = false;
         initAnimation();
         mRunning = true;
         if (mSeekFraction >= 0) {