From 721d9725ad69b60ced5812ffce3afd1557f1180b Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Wed, 3 Aug 2011 11:49:59 -0700
Subject: [PATCH] Fix NPE when getting app icons

Change-Id: I04c171424006d90321c707d124211f007159c774
---
 src/com/android/launcher2/IconCache.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index 20c5f34add..04f97f3990 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) {