Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9720671 authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp 

* changes:
  Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev am: 65dfc2a3
  Fix NPE in ValueAnimator am: 543a7ed7
parents 98240989 c98c5e0f

core/java/android/animation/ObjectAnimator.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

core/java/android/animation/ValueAnimator.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -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.