diff options
| author | John Reck <jreck@google.com> | 2015-08-04 21:13:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-04 21:13:23 +0000 |
| commit | d56554e82b591357cbb819859ddcc7b87ff7306b (patch) | |
| tree | 815ab368bbf92f8d9dea46928a3a69eec39ee184 /libs/hwui/AnimatorManager.cpp | |
| parent | b47ea9b2ed24f8eb6fc8b338555ff0d8825d8565 (diff) | |
| parent | 906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04 (diff) | |
am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"
* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
animateNoDamage failed to remove from current frame list
Diffstat (limited to 'libs/hwui/AnimatorManager.cpp')
| -rw-r--r-- | libs/hwui/AnimatorManager.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp index 0dababd774c1..cd30b1859384 100644 --- a/libs/hwui/AnimatorManager.cpp +++ b/libs/hwui/AnimatorManager.cpp @@ -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); |