Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Quick fix: Make incorrect animator usage a warning" into oc-mr1-dev

Browse Source
This commit is contained in:
John Reck
2017-09-26 16:23:43 +00:00
committed by Android (Google) Code Review
parent 9b120d5a08 d2080d52b3
commit 2d362d7159
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/hwui/AnimatorManager.cpp
View File

@@ -71,9 +71,11 @@ void AnimatorManager::setAnimationHandle(AnimationHandle* handle) {
void AnimatorManager::pushStaging() { void AnimatorManager::pushStaging() {
if (mNewAnimators.size()) { if (mNewAnimators.size()) {
LOG_ALWAYS_FATAL_IF(!mAnimationHandle, if (CC_UNLIKELY(!mAnimationHandle)) {
"Trying to start new animators on %p (%s) without an animation handle!", ALOGW("Trying to start new animators on %p (%s) without an animation handle!",
&mParent, mParent.getName()); &mParent, mParent.getName());
return;
}
// Only add new animators that are not already in the mAnimators list // Only add new animators that are not already in the mAnimators list
for (auto& anim : mNewAnimators) { for (auto& anim : mNewAnimators) {