commit 2225ba3046d559dc1bf9f947a786dee19ad73971
author Sunny Goyal <sunnygoyal@google.com> Mon Oct 26 18:02:31 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Oct 26 18:02:31 2015 +0000
tree 18c117966e1ad6406b5310e5fa0401075bb0e0be
parent c1763b24fc7ea6d23087197d6091c56916a51e17
parent 1ba7e36cc8901b34b91d06fdc868a63f9a8fad2d

Fixing null check when calling mutateOnMainThread
am: 1ba7e36cc8

* commit '1ba7e36cc8901b34b91d06fdc868a63f9a8fad2d':
  Fixing null check when calling mutateOnMainThread

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,