commit 68dce922af4f3611fc5e6bfaf5eaa76d5db262f8
author John Reck <jreck@google.com> Wed Jan 11 01:30:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 11 01:30:59 2017 +0000
tree 9b77364894aa032d1f601949a5c9e8edb999ed34
parent 11765b3fcc776ca93eb9cf7b024a7c09b7d7555c
parent 5f3ed9b7dec34ea9cdced3b16ee7b7094f8b09aa

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

Change-Id: I6e35191f4ddda2590eae4cfac9af5c781d0e493b

libs/hwui/AnimatorManager.cpp

diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp
index 9d5860c..f5bb821 100644
--- a/libs/hwui/AnimatorManager.cpp
+++ b/libs/hwui/AnimatorManager.cpp
@@ -142,7 +142,7 @@
 }
 
 uint32_t AnimatorManager::animateCommon(TreeInfo& info) {
-    uint32_t dirtyMask;
+    uint32_t dirtyMask = 0;
     AnimateFunctor functor(info, mAnimationHandle->context(), &dirtyMask);
     auto newEnd = std::remove_if(mAnimators.begin(), mAnimators.end(), functor);
     mAnimators.erase(newEnd, mAnimators.end());