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

Commit d56554e8 authored by John Reck's avatar John Reck Committed by Android Git Automerger
Browse files

am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list" 

* commit '906c8dea':
  animateNoDamage failed to remove from current frame list
parents b47ea9b2 906c8dea

libs/hwui/AnimatorManager.cpp

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



void AnimatorManager::animateNoDamage(TreeInfo& info) {

    if (!mAnimators.size()) return;



    animateCommon(info);

}
@@ -169,7 +167,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);