diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-08-03 11:52:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-03 11:52:31 -0700 |
| commit | c609015e97ef83bff0c6657f87b6e42f2ebdee1d (patch) | |
| tree | aae3290856c4e98595c005efc7eb57d438bc4add /src | |
| parent | 375b01e38fd61db81162a4ffaddd4d7a7c337f7d (diff) | |
| parent | 721d9725ad69b60ced5812ffce3afd1557f1180b (diff) | |
| download | android_packages_apps_Trebuchet-c609015e97ef83bff0c6657f87b6e42f2ebdee1d.tar.gz android_packages_apps_Trebuchet-c609015e97ef83bff0c6657f87b6e42f2ebdee1d.tar.bz2 android_packages_apps_Trebuchet-c609015e97ef83bff0c6657f87b6e42f2ebdee1d.zip | |
Merge "Fix NPE when getting app icons"
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/IconCache.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java index 20c5f34ad..04f97f399 100644 --- a/src/com/android/launcher2/IconCache.java +++ b/src/com/android/launcher2/IconCache.java @@ -69,11 +69,14 @@ public class IconCache { } public Drawable getFullResIcon(Resources resources, int iconId) { + Drawable d; try { - return resources.getDrawableForDensity(iconId, mIconDpi); + d = resources.getDrawableForDensity(iconId, mIconDpi); } catch (Resources.NotFoundException e) { - return getFullResDefaultActivityIcon(); + d = null; } + + return (d != null) ? d : getFullResDefaultActivityIcon(); } public Drawable getFullResIcon(ResolveInfo info, PackageManager packageManager) { |