commit 9fe71456e6610a651d43af502bcd7042916fd2f3
author Joe Onorato <joeo@android.com> Thu Mar 11 17:59:11 2010 -0800
committer android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> Thu Mar 11 18:16:39 2010 -0800
tree 3fbe31afdd8ec095b390aa85042dfa7577811c85
parent 7f5bbaaeaa327854936afbe7811e9792e7c20e36

Bug 2509023 - NPE on upgrade to froyo

Change-Id: I07cb4f272948062b47da8826ca917fd74ad18404

src/com/android/launcher2/LauncherModel.java

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 6560c5d..cc59538 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -1195,14 +1195,14 @@
             } else {
                 info.customIcon = true;
             }
-            info.setIcon(icon);
             break;
         default:
-            info.setIcon(getFallbackIcon());
+            icon = getFallbackIcon();
             info.usingFallbackIcon = true;
             info.customIcon = false;
             break;
         }
+        info.setIcon(icon);
         return info;
     }