From 55b46eff394e23cde692e8acdfd7b42676a3f198 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Mon, 3 Nov 2014 10:00:33 -0800
Subject: [PATCH] Fix cancel crash

Bug: 18059003
Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
---
 core/java/android/view/RenderNodeAnimator.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/java/android/view/RenderNodeAnimator.java b/core/java/android/view/RenderNodeAnimator.java
index debf45de0a4f9..b95f9a4cab526 100644
--- 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();