diff options
| author | Chris Craik <ccraik@google.com> | 2016-07-11 12:20:51 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2016-07-11 19:26:18 +0000 |
| commit | e3e481df762747c5f01bbd1503800fa29457fc1b (patch) | |
| tree | d8aa5a01bcc5150999b472c0be25dcb1f98374d9 /libs/hwui/RenderNode.cpp | |
| parent | 377a8dd1e4909aa78d57ae3eb4ce885a7bad61c0 (diff) | |
Avoid throwing when 0 size layer requested
bug:30032790
Change-Id: I8553af0d0b0d59fea6535d03479c4e7134a9f4f9
Diffstat (limited to 'libs/hwui/RenderNode.cpp')
| -rw-r--r-- | libs/hwui/RenderNode.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp index f8797bf63442..6facf20b025c 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -301,7 +301,10 @@ void RenderNode::pushLayerUpdate(TreeInfo& info) { LayerType layerType = properties().effectiveLayerType(); // If we are not a layer OR we cannot be rendered (eg, view was detached) // we need to destroy any Layers we may have had previously - if (CC_LIKELY(layerType != LayerType::RenderLayer) || CC_UNLIKELY(!isRenderable())) { + if (CC_LIKELY(layerType != LayerType::RenderLayer) + || CC_UNLIKELY(!isRenderable()) + || CC_UNLIKELY(properties().getWidth() == 0) + || CC_UNLIKELY(properties().getHeight() == 0)) { if (CC_UNLIKELY(mLayer)) { destroyLayer(mLayer); mLayer = nullptr; |