From d58230c7f708a70e2ab76c12e28916188056fc52 Mon Sep 17 00:00:00 2001
From: John Reck <jreck@google.com>
Date: Wed, 3 Aug 2016 10:28:10 -0700
Subject: [PATCH] Fix RNA crash

Bug: 30632377
Change-Id: I5d53fba0f469553ae90bebad1482ef28965dd853
---
 libs/hwui/AnimatorManager.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp
index f170e9cda8afa..8d5f1a83e2114 100644
--- a/libs/hwui/AnimatorManager.cpp
+++ b/libs/hwui/AnimatorManager.cpp
@@ -83,8 +83,11 @@ void AnimatorManager::pushStaging() {
         }
         mNewAnimators.clear();
     }
-    for (auto& animator : mAnimators) {
-        animator->pushStaging(mAnimationHandle->context());
+    if (mAnimators.size()) {
+        for (auto& animator : mAnimators) {
+            animator->pushStaging(mAnimationHandle->context());
+        }
+        mParent.mProperties.updateMatrix();
     }
 }