summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2016-08-03 10:28:10 -0700
committerJohn Reck <jreck@google.com>2016-08-03 10:28:10 -0700
commitd58230c7f708a70e2ab76c12e28916188056fc52 (patch)
treeeb0ed1aeff881016d61d8ef0cb8133d3c330da66 /libs
parentc9682ab5b508a242f0d569857ee9f6a3b82578de (diff)
downloadandroid-frameworks-base-d58230c7f708a70e2ab76c12e28916188056fc52.tar.gz
android-frameworks-base-d58230c7f708a70e2ab76c12e28916188056fc52.tar.xz
Fix RNA crash
Bug: 30632377 Change-Id: I5d53fba0f469553ae90bebad1482ef28965dd853
Diffstat (limited to 'libs')
-rw-r--r--libs/hwui/AnimatorManager.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp
index f170e9c..8d5f1a8 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();
}
}