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

Commit a54a5f65 authored by John Reck's avatar John Reck Committed by android-build-merger
Browse files

Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev 

am: 2d362d71

Change-Id: I7e2895fdb802c25389a689f87e60fe408c955405
parents 01cc377d 2d362d71

libs/hwui/AnimatorManager.cpp

+5 −3
Original line number Diff line number Diff line
@@ -71,9 +71,11 @@ void AnimatorManager::setAnimationHandle(AnimationHandle* handle) { 


void AnimatorManager::pushStaging() {

    if (mNewAnimators.size()) {

        LOG_ALWAYS_FATAL_IF(!mAnimationHandle,

                "Trying to start new animators on %p (%s) without an animation handle!",

        if (CC_UNLIKELY(!mAnimationHandle)) {

            ALOGW("Trying to start new animators on %p (%s) without an animation handle!",

                    &mParent, mParent.getName());

            return;

        }



        // Only add new animators that are not already in the mAnimators list

        for (auto& anim : mNewAnimators) {