diff options
| author | Joe Onorato <joeo@android.com> | 2010-03-11 17:59:11 -0800 |
|---|---|---|
| committer | Joe Onorato <joeo@android.com> | 2010-03-11 17:59:11 -0800 |
| commit | d8d22da5ca3e8d3e8d2e3616305b038d37486f32 (patch) | |
| tree | e4157e8a75bf75f2b269afa0ff286a842d3a7101 /src | |
| parent | c131b74922e6323331c374856bda830010d761c8 (diff) | |
| download | android_packages_apps_Trebuchet-d8d22da5ca3e8d3e8d2e3616305b038d37486f32.tar.gz android_packages_apps_Trebuchet-d8d22da5ca3e8d3e8d2e3616305b038d37486f32.tar.bz2 android_packages_apps_Trebuchet-d8d22da5ca3e8d3e8d2e3616305b038d37486f32.zip | |
Bug 2509023 - NPE on upgrade to froyo
Change-Id: I07cb4f272948062b47da8826ca917fd74ad18404
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/LauncherModel.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java index 79a57031f..c6813c378 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; } |