diff options
| author | Chris Craik <ccraik@google.com> | 2016-07-11 21:28:23 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-11 21:28:23 +0000 |
| commit | ec83bd15c82d1983e764418139f65ef56761a52a (patch) | |
| tree | 2c6dc43452bb313f171d1a07bff4dc0ff11183f2 /libs/hwui/RenderNode.cpp | |
| parent | 6ab97e587ed57f7aacb5d9e01554ac297481d7a0 (diff) | |
| parent | 272b82792590c75e57ec365672b7b3617c8c2edb (diff) | |
Merge \"Avoid throwing when 0 size layer requested\" into nyc-mr1-dev
am: 272b827925
Change-Id: Ibd3f90aea167b7ee0e1f9add327a651ba94c7883
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; |