commit d8d22da5ca3e8d3e8d2e3616305b038d37486f32
author Joe Onorato <joeo@android.com> Thu Mar 11 17:59:11 2010 -0800
committer Joe Onorato <joeo@android.com> Thu Mar 11 17:59:11 2010 -0800
tree e4157e8a75bf75f2b269afa0ff286a842d3a7101
parent c131b74922e6323331c374856bda830010d761c8

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 79a5703..c6813c3 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -1202,14 +1202,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;
     }