commit e3e481df762747c5f01bbd1503800fa29457fc1b
author Chris Craik <ccraik@google.com> Mon Jul 11 12:20:51 2016 -0700
committer Chris Craik <ccraik@google.com> Mon Jul 11 19:26:18 2016 +0000
tree d8aa5a01bcc5150999b472c0be25dcb1f98374d9
parent 377a8dd1e4909aa78d57ae3eb4ce885a7bad61c0

Avoid throwing when 0 size layer requested

bug:30032790

Change-Id: I8553af0d0b0d59fea6535d03479c4e7134a9f4f9

libs/hwui/RenderNode.cpp

diff --git a/libs/hwui/RenderNode.cpp b/libs/hwui/RenderNode.cpp
index f8797bf..6facf20 100644
--- a/libs/hwui/RenderNode.cpp
+++ b/libs/hwui/RenderNode.cpp
@@ -301,7 +301,10 @@
     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;