diff options
| author | 2017-09-26 16:34:45 +0000 | |
|---|---|---|
| committer | 2017-09-26 16:34:45 +0000 | |
| commit | a54a5f6512dc7722c116d6b556636cb0b8c58a8c (patch) | |
| tree | e8905b0fcb284833ac4cfe3f63c1daa6b5ed16dc /libs | |
| parent | 01cc377d88812708cbab06ad9c7e8fd07f978069 (diff) | |
| parent | 2d362d715927b9735a8c76f9f188877b2953c061 (diff) | |
Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev
am: 2d362d7159
Change-Id: I7e2895fdb802c25389a689f87e60fe408c955405
Diffstat (limited to 'libs')
| -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) { |