Merge "Applications with broken resources get default icon" into honeycomb-mr1

2011-03-10 13:10:08 -08:00
parent 132ab8dc22 20b0a5f0fd
commit 6c1dde4d59
1 changed files with 12 additions and 4 deletions
@@ -68,11 +68,13 @@ public class IconCache {
                com.android.internal.R.mipmap.sym_def_app_icon);
    }

-    public Drawable getFullResIcon(Resources resources, int iconId) {
+    public Drawable getFullResIcon(Resources resources, int iconId)
+            throws Resources.NotFoundException {
        return resources.getDrawableForDensity(iconId, mIconDpi);
    }

-    public Drawable getFullResIcon(ResolveInfo info, PackageManager packageManager) {
+    public Drawable getFullResIcon(ResolveInfo info, PackageManager packageManager)
+            throws Resources.NotFoundException {
        Resources resources;
        try {
            resources = packageManager.getResourcesForApplication(
@@ -174,8 +176,14 @@ public class IconCache {
            if (entry.title == null) {
                entry.title = info.activityInfo.name;
            }
-            entry.icon = Utilities.createIconBitmap(
-                    getFullResIcon(info, mPackageManager), mContext);
+
+            Drawable icon;
+            try {
+                icon = getFullResIcon(info, mPackageManager);
+            } catch (Resources.NotFoundException e) {
+                icon = getFullResDefaultActivityIcon();
+            }
+            entry.icon = Utilities.createIconBitmap(icon, mContext);
        }
        return entry;
    }