From c2ad7a6e1571f933f4bc8ceaee5c745a96aaaf68 Mon Sep 17 00:00:00 2001 From: Romain Guy Date: Thu, 14 May 2009 17:43:39 -0700 Subject: [PATCH] Fix for #1855127. When Home cannot decode an icon, it should not interrupt the loading of the workspace, but fallback to the default package icon. --- src/com/android/launcher/LauncherModel.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher/LauncherModel.java b/src/com/android/launcher/LauncherModel.java index 3a7fac6574..19f6e9b083 100644 --- a/src/com/android/launcher/LauncherModel.java +++ b/src/com/android/launcher/LauncherModel.java @@ -1169,9 +1169,14 @@ public class LauncherModel { break; case LauncherSettings.Favorites.ICON_TYPE_BITMAP: byte[] data = c.getBlob(iconIndex); - Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length); - info.icon = new FastBitmapDrawable( - Utilities.createBitmapThumbnail(bitmap, launcher)); + try { + Bitmap bitmap = BitmapFactory.decodeByteArray(data, 0, data.length); + info.icon = new FastBitmapDrawable( + Utilities.createBitmapThumbnail(bitmap, launcher)); + } catch (Exception e) { + packageManager = launcher.getPackageManager(); + info.icon = packageManager.getDefaultActivityIcon(); + } info.filtered = true; info.customIcon = true; break;