commit 30be2cd2a4b9cedfcbb6c317449c11bb0dcc64cc
author Adam Cohen <adamcohen@google.com> Wed Aug 03 11:55:55 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 03 11:55:55 2011 -0700
tree a7a4bb85727e1946119cb6213259636aef1062e5
parent c609015e97ef83bff0c6657f87b6e42f2ebdee1d
parent 4e012846cd09caa85b018c36810e9a64adb87640

Merge "Revert "Clear the bitmap associated with canvases.""

src/com/android/launcher2/IconCache.java

diff --git a/src/com/android/launcher2/IconCache.java b/src/com/android/launcher2/IconCache.java
index 2977383..3dc7808 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) {