Merge "animateNoDamage failed to remove from current frame list"

2015-08-04 20:52:40 +00:00
parent 93c1406958 68eb3b22b0
commit bc04d3acba
1 changed files with 1 additions and 3 deletions
--- a/libs/hwui/AnimatorManager.cpp
+++ b/libs/hwui/AnimatorManager.cpp
@@ -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);