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

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

Browse Source 
automerge: 9280480

* commit '928048040cb5cd205ff5e74f9393dca2371c519a':
  Fix cancel crash
This commit is contained in:
John Reck
2014-11-03 18:32:20 +00:00
committed by android-build-merger
parent d90238eb15 928048040c
commit 43973c9d73
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();