commit 721d9725ad69b60ced5812ffce3afd1557f1180b
author Michael Jurka <mikejurka@google.com> Wed Aug 03 11:49:59 2011 -0700
committer Michael Jurka <mikejurka@google.com> Wed Aug 03 11:50:21 2011 -0700
tree eb4c492650deb0caf5153316d98ae715ec2c2ab4
parent e5885b587c708162246225c9168ea14bc99b7ae4

Fix NPE when getting app icons

Change-Id: I04c171424006d90321c707d124211f007159c774

src/com/android/launcher2/IconCache.java

diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index 20c5f34..04f97f3 100644
--- a/src/com/android/launcher2/IconCache.java
+++ b/src/com/android/launcher2/IconCache.java
@@ -69,11 +69,14 @@
     }
 
     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) {