summaryrefslogtreecommitdiff
path: root/libs/hwui/AnimatorManager.cpp
diff options
context:
space:
mode:
authorFred Fettinger <fettinge@motorola.com>2015-07-01 16:43:48 -0500
committerJohn Reck <jreck@google.com>2015-07-30 13:03:00 -0700
commit2ccb5030c691849c1dfadf9c7136b7fc18acab9c (patch)
tree4838ccbdea6e61a69e8a5403352d8c9e2d303a9c /libs/hwui/AnimatorManager.cpp
parentcef25e5319e4f76682dd63a3c01bfacb19aeeb51 (diff)
animateNoDamage failed to remove from current frame list
runRemainingAnimations is used to animate the available animation handle which were not yet run, it actually animate those animation handle and removes from the list by notifyAnimationsRan(). In case if these animation handles are not removed, it leads to the Fatal Assert of runRemainingAnimations. Some usecases causes the addition of animation handle when there is no animators, in these cases this check prevents execution of notifyAnimationsRan() leads to Fatal Assert crash of runRemainingAnimations. Allowing the animation to happen irrespective of animators solves the problem Change-Id: I685dc7ebf736268927a536595910fc63353306eb Signed-off-by: Parasuraman <parasur@motorola.com> Signed-off-by: Fred Fettinger <fettinge@motorola.com>
Diffstat (limited to 'libs/hwui/AnimatorManager.cpp')
-rw-r--r--libs/hwui/AnimatorManager.cpp4
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);