Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 43973c9d: am 1787b4ea: Merge "Fix cancel crash" into lmp-mr1-dev automerge: 9280480

Browse Source 
* commit '43973c9d732d74dec12e796fb40ae285c1687d6a':
  Fix cancel crash
This commit is contained in:
John Reck
2014-11-03 18:41:39 +00:00
committed by Android Git Automerger
parent 7526d81d43 43973c9d73
commit d0f91ebaef
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/RenderNodeAnimator.java
View File

@@ -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();