commit 1ba7e36cc8901b34b91d06fdc868a63f9a8fad2d
author Sunny Goyal <sunnygoyal@google.com> Mon Oct 26 10:42:12 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Mon Oct 26 10:42:12 2015 -0700
tree 53cae94cb104fa6dc746bc837bbe1128918cfb35
parent 52040c2d51d9c4d1bfaeda8e067deb7655099840

Fixing null check when calling mutateOnMainThread

Bug: 25269169
Change-Id: I74f7fb833a374f59a16487099f1bf72b086e88ee

src/com/android/launcher3/WidgetPreviewLoader.java

diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java
index 603b072..10c1053 100644
--- a/src/com/android/launcher3/WidgetPreviewLoader.java
+++ b/src/com/android/launcher3/WidgetPreviewLoader.java
@@ -428,8 +428,9 @@
             float iconScale = Math.min((float) smallestSide / (appIconSize + 2 * minOffset), scale);
 
             try {
-                Drawable icon = mutateOnMainThread(mManager.loadIcon(info, mIconCache));
+                Drawable icon = mManager.loadIcon(info, mIconCache);
                 if (icon != null) {
+                    icon = mutateOnMainThread(icon);
                     int hoffset = (int) ((tileW - appIconSize * iconScale) / 2) + x;
                     int yoffset = (int) ((tileH - appIconSize * iconScale) / 2);
                     icon.setBounds(hoffset, yoffset,