PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix NPE in WidgetPreviewLoader" into ub-now-nova

Browse Source
This commit is contained in:
Adrian Roos
2014-05-14 11:21:53 +00:00
committed by Android (Google) Code Review
parent 244637b59c fa9ffc28fd
commit 0c28186282
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/WidgetPreviewLoader.java
+8 -5
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));