diff options
| author | John Reck <jreck@google.com> | 2017-09-26 16:52:15 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-09-26 16:52:15 +0000 |
| commit | 997ac15bcbea042b46df031ea795be85d44de491 (patch) | |
| tree | 8e209e9ae135ba74e0f064503673e90bd5ff294f | |
| parent | 743f6c37b15faf8222ca598cdd650734854c0dd2 (diff) | |
| parent | a54a5f6512dc7722c116d6b556636cb0b8c58a8c (diff) | |
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev am: 2d362d7159
am: a54a5f6512
Change-Id: I3e78ede76656eff16fce54808a052ab79105ae79
| -rw-r--r-- | libs/hwui/AnimatorManager.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp index f5bb821f4e23..69ead5890566 100644 --- a/libs/hwui/AnimatorManager.cpp +++ b/libs/hwui/AnimatorManager.cpp @@ -71,9 +71,11 @@ void AnimatorManager::setAnimationHandle(AnimationHandle* handle) { void AnimatorManager::pushStaging() { if (mNewAnimators.size()) { - LOG_ALWAYS_FATAL_IF(!mAnimationHandle, - "Trying to start new animators on %p (%s) without an animation handle!", - &mParent, mParent.getName()); + if (CC_UNLIKELY(!mAnimationHandle)) { + ALOGW("Trying to start new animators on %p (%s) without an animation handle!", + &mParent, mParent.getName()); + return; + } // Only add new animators that are not already in the mAnimators list for (auto& anim : mNewAnimators) { |