commit 30412d34a4d289a90f842f4270b27d2093ade3cd
author Joe Onorato <joeo@android.com> Wed Sep 23 11:40:03 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 23 11:40:03 2009 -0700
tree b5be23d24f9aac26ff65598524e591aeb7c32d6b
parent 4083be7c29af2f93be7d4deeff33e3bb820c70de
parent 533e2728352fc55a14e4f1b689a916cbd7a58f12

am 533e2728: Don\'t crash in onDestroy.  Not all ApplicationInfos have their icons loaded.

Merge commit '533e2728352fc55a14e4f1b689a916cbd7a58f12'

* commit '533e2728352fc55a14e4f1b689a916cbd7a58f12':
  Don't crash in onDestroy.  Not all ApplicationInfos have their icons loaded.

src/com/android/launcher2/AppInfoCache.java

diff --git a/src/com/android/launcher2/AppInfoCache.java b/src/com/android/launcher2/AppInfoCache.java
index 65ae570..f89e3ab 100644
--- a/src/com/android/launcher2/AppInfoCache.java
+++ b/src/com/android/launcher2/AppInfoCache.java
@@ -148,7 +148,9 @@
     public static void unbindDrawables() {
         synchronized (sCache) {
             for (ApplicationInfo appInfo: sCache.values()) {
-                appInfo.icon.setCallback(null);
+                if (appInfo.icon != null) {
+                    appInfo.icon.setCallback(null);
+                }
             }
         }
     }