commit a54a5f6512dc7722c116d6b556636cb0b8c58a8c
author John Reck <jreck@google.com> Tue Sep 26 16:34:45 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Sep 26 16:34:45 2017 +0000
tree e8905b0fcb284833ac4cfe3f63c1daa6b5ed16dc
parent 01cc377d88812708cbab06ad9c7e8fd07f978069
parent 2d362d715927b9735a8c76f9f188877b2953c061

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

Change-Id: I7e2895fdb802c25389a689f87e60fe408c955405

libs/hwui/AnimatorManager.cpp

diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp
index f5bb821..69ead58 100644
--- a/libs/hwui/AnimatorManager.cpp
+++ b/libs/hwui/AnimatorManager.cpp
@@ -71,9 +71,11 @@
 
 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) {