diff options
| author | Chris Craik <ccraik@google.com> | 2016-07-12 02:16:05 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 02:16:05 +0000 |
| commit | 52c4eba143ce88a231e2691f65abd076f9e21c18 (patch) | |
| tree | 24f0aaac06b23b38125a89f2e7b8781c7958c2b0 /libs/hwui/RenderNode.cpp | |
| parent | b334d64371440576285f98f87906bf2f066bb446 (diff) | |
| parent | ec83bd15c82d1983e764418139f65ef56761a52a (diff) | |
Merge \\"Avoid throwing when 0 size layer requested\\" into nyc-mr1-dev am: 272b827925
am: ec83bd15c8
Change-Id: If585ade667c888d2f5f8e90a76125971178a7ba5
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 5330e2365d66..ff277d111197 100644 --- a/libs/hwui/RenderNode.cpp +++ b/libs/hwui/RenderNode.cpp @@ -241,7 +241,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; |