From 07c056d627be315796d53bf07f8e06f449d92668 Mon Sep 17 00:00:00 2001
From: Doris Liu <tianliu@google.com>
Date: Mon, 13 Jun 2016 12:52:44 -0700
Subject: [PATCH] Chcek for valid render content before damaging RenderNode for
 dirty VD

BUG: 29320878
Change-Id: I847d76467bad92c956a4bb7617627983d64e90f9
---
 libs/hwui/RenderNode.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index b31c554c19140..5a3300ab8044d 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();