diff options
| author | John Reck <jreck@google.com> | 2017-09-25 14:22:40 -0700 |
|---|---|---|
| committer | John Reck <jreck@google.com> | 2017-09-25 23:27:38 +0000 |
| commit | d2080d52b34dff70e4da673481ac6ec1f46a1570 (patch) | |
| tree | 940905305ba6cb3874c118134e4d51e2a6d9be0e /libs/hwui/AnimatorManager.cpp | |
| parent | 73c93f02f77e81fdfdbfd7594fc7d7f12c7cf19a (diff) | |
Quick fix: Make incorrect animator usage a warning
Change-Id: I6d59033433a63d02be746bb8523b312d7c8fe9fa
Bug: 65160121
Test: Repro from bug doesn't repro anymore
Diffstat (limited to 'libs/hwui/AnimatorManager.cpp')
| -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) { |