am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev

* commit '1787b4ea436f361e16c289755fa1a35c6e1c8845': Fix cancel crash
2014-11-03 18:31:17 +00:00
parent 2589d8e12d 1787b4ea43
commit 928048040c
1 changed files with 1 additions and 1 deletions
--- a/core/java/android/view/RenderNodeAnimator.java
+++ b/core/java/android/view/RenderNodeAnimator.java
@@ -219,7 +219,7 @@ public class RenderNodeAnimator extends Animator {

    @Override
    public void cancel() {
-        if (mState != STATE_FINISHED) {
+        if (mState != STATE_PREPARE && mState != STATE_FINISHED) {
            if (mState == STATE_DELAYED) {
                getHelper().removeDelayedAnimation(this);
                notifyStartListeners();