diff options
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java | 12 | 
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java index 26f9000ad945..d797eecad3dd 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderDrawable.java @@ -42,10 +42,6 @@ import java.util.ArrayList;  import java.util.Collections;  import java.util.List; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -  /**   * Action to render a given Drawable provided through {@link DrawableParams#getDrawable()}.   * @@ -72,8 +68,12 @@ public class RenderDrawable extends RenderAction<DrawableParams> {          BridgeContext context = getContext();          drawableResource = context.getRenderResources().resolveResValue(drawableResource); -        if (drawableResource == null || -                drawableResource.getResourceType() != ResourceType.DRAWABLE) { +        if (drawableResource == null) { +            return Status.ERROR_NOT_A_DRAWABLE.createResult(); +        } + +        ResourceType resourceType = drawableResource.getResourceType(); +        if (resourceType != ResourceType.DRAWABLE && resourceType != ResourceType.MIPMAP) {              return Status.ERROR_NOT_A_DRAWABLE.createResult();          }  |