| commit | 55b46eff394e23cde692e8acdfd7b42676a3f198 | [log] [tgz] |
|---|---|---|
| author | John Reck <jreck@google.com> | Mon Nov 03 10:00:33 2014 -0800 |
| committer | John Reck <jreck@google.com> | Mon Nov 03 10:00:33 2014 -0800 |
| tree | 079afa75419a4c25acd2ec48d22ae5038c94bc3f | |
| parent | dde49a4fe8ae9a4736d171efbadb067e7d4cc81d [diff] |
Fix cancel crash Bug: 18059003 Change-Id: I579468fbd1645049f8fbe335faf4da1f2d3bb0a3
diff --git a/core/java/android/view/RenderNodeAnimator.java b/core/java/android/view/RenderNodeAnimator.java index debf45d..b95f9a4 100644 --- a/core/java/android/view/RenderNodeAnimator.java +++ b/core/java/android/view/RenderNodeAnimator.java
@@ -219,7 +219,7 @@ @Override public void cancel() { - if (mState != STATE_FINISHED) { + if (mState != STATE_PREPARE && mState != STATE_FINISHED) { if (mState == STATE_DELAYED) { getHelper().removeDelayedAnimation(this); notifyStartListeners();