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

Commit 148f57fc authored by Doris Liu's avatar Doris Liu
Browse files

Ensure animator's interpolator is set 

Animator's play state can go from NotStarted to Finished directly
in the case of calling start() and end() within one frame. Previously
we only set animator's interpolator when the animator is transitioning
to Running state. So when Running state is skipped, the interpolator
is left unset.

Bug: 27224373
Change-Id: I5a53106fe1aae38ccaf1df8debd553be3bc56133
parent c21e8bcb

libs/hwui/Animator.cpp

+4 −4
Original line number Diff line number Diff line
@@ -160,6 +160,10 @@ void BaseRenderNodeAnimator::pushStaging(AnimationContext& context) { 
    }



    if (!mStagingRequests.empty()) {

        // No interpolator was set, use the default

        if (mPlayState == PlayState::NotStarted && !mInterpolator) {

            mInterpolator.reset(Interpolator::createDefaultInterpolator());

        }

        // Keep track of the play state and play time before they are changed when

        // staging requests are resolved.

        nsecs_t currentPlayTime = mPlayTime;
@@ -222,10 +226,6 @@ void BaseRenderNodeAnimator::transitionToRunning(AnimationContext& context) { 
        // Set to 0 so that the animate() basically instantly finishes

        mStartTime = 0;

    }

    // No interpolator was set, use the default

    if (!mInterpolator) {

        mInterpolator.reset(Interpolator::createDefaultInterpolator());

    }

    if (mDuration < 0 || mDuration > 50000) {

        ALOGW("Your duration is strange and confusing: %" PRId64, mDuration);

    }