summaryrefslogtreecommitdiff
path: root/libs/hwui/RenderNode.cpp
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2016-06-13 12:52:44 -0700
committerDoris Liu <tianliu@google.com>2016-06-13 12:52:44 -0700
commit07c056d627be315796d53bf07f8e06f449d92668 (patch)
tree38bb999499f0ded5be99992f5ec6665b1abe1d9f /libs/hwui/RenderNode.cpp
parenta3d4baf43b22f205cc0b26af9eb25df25b5c9a3e (diff)
Chcek for valid render content before damaging RenderNode for dirty VD
BUG: 29320878 Change-Id: I847d76467bad92c956a4bb7617627983d64e90f9
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r--libs/hwui/RenderNode.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index b31c554c1914..5a3300ab8044 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -421,12 +421,14 @@ void RenderNode::prepareTreeImpl(TreeInfo& info, bool functorsNeedLayer) {
prepareSubTree(info, childFunctorsNeedLayer, mDisplayList);
pushLayerUpdate(info);
- for (auto& vectorDrawable : mDisplayList->getVectorDrawables()) {
- // If any vector drawable in the display list needs update, damage the node.
- if (vectorDrawable->isDirty()) {
- damageSelf(info);
+ if (mDisplayList) {
+ for (auto& vectorDrawable : mDisplayList->getVectorDrawables()) {
+ // If any vector drawable in the display list needs update, damage the node.
+ if (vectorDrawable->isDirty()) {
+ damageSelf(info);
+ }
+ vectorDrawable->setPropertyChangeWillBeConsumed(true);
}
- vectorDrawable->setPropertyChangeWillBeConsumed(true);
}
info.damageAccumulator->popTransform();