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

Merge "Fix cancel crash" into lmp-mr1-dev

Browse Source
This commit is contained in:
John Reck
2014-11-03 18:27:40 +00:00
committed by Android (Google) Code Review
parent 188416bf38 55b46eff39
commit 1787b4ea43
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 @Override
public void cancel() { public void cancel() {
if (mState != STATE_FINISHED) { if (mState != STATE_PREPARE && mState != STATE_FINISHED) {
if (mState == STATE_DELAYED) { if (mState == STATE_DELAYED) {
getHelper().removeDelayedAnimation(this); getHelper().removeDelayedAnimation(this);
notifyStartListeners(); notifyStartListeners();