commit b38170a7a555ed59aad9b9382337abb15137f698
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Apr 26 17:55:00 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Apr 26 17:55:00 2018 +0000
tree cf07dd27238b0bb66b6d48bf0787e05964edd2a5
parent 6a9bc7dfa794a2fe2a3ac57b6039c15752d5633e
parent 4ac406db22ef19b456be1cff857af04a3ca8db27

Merge "Avoid crash when widget previews have no intrinsic size" into ub-launcher3-edmonton

src/com/android/launcher3/WidgetPreviewLoader.java

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index a658d58..7af4bf9 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -338,7 +338,8 @@
         int previewWidth;
         int previewHeight;
 
-        if (widgetPreviewExists) {
+        if (widgetPreviewExists && drawable.getIntrinsicWidth() > 0
+                && drawable.getIntrinsicHeight() > 0) {
             previewWidth = drawable.getIntrinsicWidth();
             previewHeight = drawable.getIntrinsicHeight();
         } else {
@@ -358,8 +359,8 @@
             scale = maxPreviewWidth / (float) (previewWidth);
         }
         if (scale != 1f) {
-            previewWidth = (int) (scale * previewWidth);
-            previewHeight = (int) (scale * previewHeight);
+            previewWidth = Math.max((int)(scale * previewWidth), 1);
+            previewHeight = Math.max((int)(scale * previewHeight), 1);
         }
 
         // If a bitmap is passed in, we use it; otherwise, we create a bitmap of the right size