From d8d22da5ca3e8d3e8d2e3616305b038d37486f32 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Thu, 11 Mar 2010 17:59:11 -0800
Subject: [PATCH] Bug 2509023 - NPE on upgrade to froyo

Change-Id: I07cb4f272948062b47da8826ca917fd74ad18404
---
 src/com/android/launcher2/LauncherModel.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index 79a57031f9..c6813c3783 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -1202,14 +1202,14 @@ public class LauncherModel extends BroadcastReceiver {
             } 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;
     }