From fa9ffc28fd4d230cf38b55840238f5595716abc8 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Mon, 12 May 2014 15:59:59 +0200 Subject: Fix NPE in WidgetPreviewLoader Change-Id: Ic746f2a5e4237a9ea82abf5f9532307d40432ac1 --- src/com/android/launcher3/WidgetPreviewLoader.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/com') diff --git a/src/com/android/launcher3/WidgetPreviewLoader.java b/src/com/android/launcher3/WidgetPreviewLoader.java index 48fe269c1..1b37700c6 100644 --- a/src/com/android/launcher3/WidgetPreviewLoader.java +++ b/src/com/android/launcher3/WidgetPreviewLoader.java @@ -515,9 +515,10 @@ public class WidgetPreviewLoader { Drawable drawable = null; if (previewImage != 0) { - drawable = mutateOnMainThread( - mPackageManager.getDrawable(packageName, previewImage, null)); - if (drawable == null) { + drawable = mPackageManager.getDrawable(packageName, previewImage, null); + if (drawable != null) { + drawable = mutateOnMainThread(drawable); + } else { Log.w(TAG, "Can't load widget preview drawable 0x" + Integer.toHexString(previewImage) + " for provider: " + provider); } @@ -572,9 +573,11 @@ public class WidgetPreviewLoader { (int) ((previewDrawableWidth - mAppIconSize * iconScale) / 2); int yoffset = (int) ((previewDrawableHeight - mAppIconSize * iconScale) / 2); - if (iconId > 0) - icon = mutateOnMainThread(mIconCache.getFullResIcon(packageName, iconId)); + if (iconId > 0) { + icon = mIconCache.getFullResIcon(packageName, iconId); + } if (icon != null) { + icon = mutateOnMainThread(icon); renderDrawableToBitmap(icon, defaultPreview, hoffset, yoffset, (int) (mAppIconSize * iconScale), (int) (mAppIconSize * iconScale)); -- cgit v1.2.3