Merge "Fix a use-of-uninitialized-value warning." am: 95ef9ec5b1 am: 44e14d0d2b

am: 5f3ed9b7de

Change-Id: I6e35191f4ddda2590eae4cfac9af5c781d0e493b
This commit is contained in:
John Reck
2017-01-11 01:30:59 +00:00
committed by android-build-merger

View File

@@ -142,7 +142,7 @@ void AnimatorManager::animateNoDamage(TreeInfo& info) {
} }
uint32_t AnimatorManager::animateCommon(TreeInfo& info) { uint32_t AnimatorManager::animateCommon(TreeInfo& info) {
uint32_t dirtyMask; uint32_t dirtyMask = 0;
AnimateFunctor functor(info, mAnimationHandle->context(), &dirtyMask); AnimateFunctor functor(info, mAnimationHandle->context(), &dirtyMask);
auto newEnd = std::remove_if(mAnimators.begin(), mAnimators.end(), functor); auto newEnd = std::remove_if(mAnimators.begin(), mAnimators.end(), functor);
mAnimators.erase(newEnd, mAnimators.end()); mAnimators.erase(newEnd, mAnimators.end());