drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'bc04d3acba766c1440e2ab0763aa1352efcf54a8':
  animateNoDamage failed to remove from current frame list
This commit is contained in:
John Reck
2015-08-04 20:59:57 +00:00
committed by Android Git Automerger
parent 2fa3eec0e1 bc04d3acba
commit 906c8dea2e
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

@ -123,8 +123,6 @@ uint32_t AnimatorManager::animate(TreeInfo& info) {
} }
void AnimatorManager::animateNoDamage(TreeInfo& info) { void AnimatorManager::animateNoDamage(TreeInfo& info) {
if (!mAnimators.size()) return;
animateCommon(info); animateCommon(info);
} }
@ -167,7 +165,7 @@ private:
}; };
void AnimatorManager::endAllActiveAnimators() { void AnimatorManager::endAllActiveAnimators() {
ALOGD("endAllStagingAnimators on %p (%s) with handle %p", ALOGD("endAllActiveAnimators on %p (%s) with handle %p",
&mParent, mParent.getName(), mAnimationHandle); &mParent, mParent.getName(), mAnimationHandle);
EndActiveAnimatorsFunctor functor(mAnimationHandle->context()); EndActiveAnimatorsFunctor functor(mAnimationHandle->context());
for_each(mAnimators.begin(), mAnimators.end(), functor); for_each(mAnimators.begin(), mAnimators.end(), functor);