aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-01 16:26:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix NPE in WidgetPreviewLoader

Browse Source 
Change-Id: Ic746f2a5e4237a9ea82abf5f9532307d40432ac1
This commit is contained in:
Adrian Roos
2014-05-12 15:59:59 +02:00
parent 1f375ab633
commit fa9ffc28fd
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/com/android/launcher3/WidgetPreviewLoader.java
View File

@@ -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));