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

Commit bc04d3ac authored by John Reck's avatar John Reck Committed by Gerrit Code Review
Browse files

Merge "animateNoDamage failed to remove from current frame list"

parents 93c14069 68eb3b22

libs/hwui/AnimatorManager.cpp

+1 −3
Original line number Diff line number Diff line
@@ -123,8 +123,6 @@ uint32_t AnimatorManager::animate(TreeInfo& info) { 
}



void AnimatorManager::animateNoDamage(TreeInfo& info) {

    if (!mAnimators.size()) return;



    animateCommon(info);

}
@@ -167,7 +165,7 @@ private: 
};



void AnimatorManager::endAllActiveAnimators() {

    ALOGD("endAllStagingAnimators on %p (%s) with handle %p",

    ALOGD("endAllActiveAnimators on %p (%s) with handle %p",

            &mParent, mParent.getName(), mAnimationHandle);

    EndActiveAnimatorsFunctor functor(mAnimationHandle->context());

    for_each(mAnimators.begin(), mAnimators.end(), functor);