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

Merge "Fix NPE in ValueAnimator" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-07-25 21:01:46 +00:00
committed by Android (Google) Code Review
parent 4e0fc3ccd2 543a7ed7af
commit 65dfc2a3e5
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/animation/ObjectAnimator.java
View File

@@ -977,7 +977,7 @@ public final class ObjectAnimator extends ValueAnimator {
@Override @Override
void animateValue(float fraction) { void animateValue(float fraction) {
final Object target = getTarget(); final Object target = getTarget();
if (mTarget != null && target == null) { if (target == null) {
// We lost the target reference, cancel and clean up. // We lost the target reference, cancel and clean up.
cancel(); cancel();
return; return;

1
core/java/android/animation/ValueAnimator.java
View File

@@ -982,6 +982,7 @@ public class ValueAnimator extends Animator implements AnimationHandler.Animatio
mStarted = true; mStarted = true;
mPaused = false; mPaused = false;
mRunning = false; mRunning = false;
mAnimationEndRequested = false;
// Resets mLastFrameTime when start() is called, so that if the animation was running, // Resets mLastFrameTime when start() is called, so that if the animation was running,
// calling start() would put the animation in the // calling start() would put the animation in the
// started-but-not-yet-reached-the-first-frame phase. // started-but-not-yet-reached-the-first-frame phase.