Merge "Add missing null check"

1 files changed, 5 insertions, 3 deletions

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index 62a9d71a5dc2..d3daec8e7dd3 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -99,9 +99,11 @@ void RenderNode::updateProperties() {
         mProperties = mStagingProperties;
     }
 
-    for (size_t i = 0; i < mDisplayListData->children.size(); i++) {
-        RenderNode* childNode = mDisplayListData->children[i]->mDisplayList;
-        childNode->updateProperties();
+    if (mDisplayListData) {
+        for (size_t i = 0; i < mDisplayListData->children.size(); i++) {
+            RenderNode* childNode = mDisplayListData->children[i]->mDisplayList;
+            childNode->updateProperties();
+        }
     }
 }