diff options
| author | Michael Jurka <mikejurka@google.com> | 2011-08-03 11:49:59 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2011-08-03 11:50:21 -0700 |
| commit | 721d9725ad69b60ced5812ffce3afd1557f1180b (patch) | |
| tree | eb4c492650deb0caf5153316d98ae715ec2c2ab4 /src | |
| parent | e5885b587c708162246225c9168ea14bc99b7ae4 (diff) | |
| download | android_packages_apps_Trebuchet-721d9725ad69b60ced5812ffce3afd1557f1180b.tar.gz android_packages_apps_Trebuchet-721d9725ad69b60ced5812ffce3afd1557f1180b.tar.bz2 android_packages_apps_Trebuchet-721d9725ad69b60ced5812ffce3afd1557f1180b.zip | |
Fix NPE when getting app icons
Change-Id: I04c171424006d90321c707d124211f007159c774
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) { |