Actually end animators on tree destruction

 Bug: 17313962

Change-Id: I66b86d50b415f9aa33da23297f22e2cf7f96f565

1 files changed, 3 insertions, 1 deletions

diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp
index 3832d426150a..678b1eedbd96 100644
--- a/libs/hwui/AnimatorManager.cpp
+++ b/libs/hwui/AnimatorManager.cpp
@@ -160,13 +160,15 @@ void AnimatorManager::endAllAnimators() {
     if (mAnimationHandle) {
         EndAnimatorsFunctor functor(mAnimationHandle->context());
         for_each(mAnimators.begin(), mAnimators.end(), functor);
+        mAnimators.clear();
+        mAnimationHandle->release();
     } else {
         // We have no context, so bust out the sledgehammer
         // This works because this state can only happen on the UI thread,
         // which means we're already on the right thread to invoke listeners
         for_each(mAnimators.begin(), mAnimators.end(), endAnimatorsHard);
+        mAnimators.clear();
     }
-    mAnimators.clear();
 }
 
 } /* namespace uirenderer */