diff options
author | 2014-03-25 10:22:09 -0700 | |
---|---|---|
committer | 2014-03-25 10:22:09 -0700 | |
commit | 5bf11bb98f5dbe278c257355d24c181237abd68c (patch) | |
tree | 14874c48911b4e0b275b6c026f8ec8a4c94e5db8 /libs/hwui/RenderNode.cpp | |
parent | 41c2d2cec3f46b28f535e9cd7f5b9da02280ccfe (diff) |
Add missing null check
Bug: 13635394
mDisplayListData can be null, make sure
to check for that before trying to walk through the
children list in updateProperties
Change-Id: I8d97b1656c1acf47b7c5df8a8771b0f30907261d
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
-rw-r--r-- | libs/hwui/RenderNode.cpp | 8 |
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(); + } } } |