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 
am: 2d362d7159

Change-Id: I7e2895fdb802c25389a689f87e60fe408c955405
This commit is contained in:
John Reck
2017-09-26 16:34:45 +00:00
committed by android-build-merger
parent 01cc377d88 2d362d7159
commit a54a5f6512
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() {
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) {