summaryrefslogtreecommitdiffstats
path: root/src/com/android/launcher2/Launcher.java
diff options
context:
space:
mode:
authortedbo <tedbo@google.com>2010-12-22 18:36:24 -0800
committertedbo <tedbo@google.com>2010-12-22 18:40:40 -0800
commit2b0857a5d84c565c73e2b18c8b191984d272ac47 (patch)
treed265fe9a7b145fef8e00b1788edd6be266ad02eb /src/com/android/launcher2/Launcher.java
parente22874e67ee99e4e1b7aea84f96809ac76aaef68 (diff)
downloadandroid_packages_apps_Trebuchet-2b0857a5d84c565c73e2b18c8b191984d272ac47.tar.gz
android_packages_apps_Trebuchet-2b0857a5d84c565c73e2b18c8b191984d272ac47.tar.bz2
android_packages_apps_Trebuchet-2b0857a5d84c565c73e2b18c8b191984d272ac47.zip
Fix NPE when running on Passion device.
This change fixes a NullPointerException that happens on the Passion device when the Launcher is started. Change-Id: If568cac8bf5a625da859b824245cca641cdc06de
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
-rw-r--r--src/com/android/launcher2/Launcher.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 82f5aea03..ee9e7a872 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -383,7 +383,9 @@ public final class Launcher extends Activity
restoreState(mSavedState);
// Update customization drawer _after_ restoring the states
- mCustomizePagedView.update();
+ if (mCustomizePagedView != null) {
+ mCustomizePagedView.update();
+ }
if (PROFILE_STARTUP) {
android.os.Debug.stopMethodTracing();