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.

2009-05-14 17:43:39 -07:00
parent 583ed3ba08
commit c2ad7a6e15
1 changed files with 8 additions and 3 deletions
@@ -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;