Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '906c8dea2ec6ae404ae6d7870c0a0cb2289f3d04':
  animateNoDamage failed to remove from current frame list
This commit is contained in:
John Reck
2015-08-04 21:13:23 +00:00
committed by Android Git Automerger
parent b47ea9b2ed 906c8dea2e
commit d56554e82b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/hwui/AnimatorManager.cpp
View File

@@ -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);