commit 3e151385ff3f1858864f73b1f5f10ae13e1667fd
author Winson Chung <winsonc@google.com> Tue Jan 04 10:12:14 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jan 04 10:12:14 2011 -0800
tree 921c186f2fb2ea055c87c4753dc5288650954d50
parent e20c4aa8165cd7d4ffc5f3f216bae08d46c9834b
parent 2b0857a5d84c565c73e2b18c8b191984d272ac47

Merge "Fix NPE when running on Passion device."

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 82f5aea..ee9e7a8 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -383,7 +383,9 @@
         restoreState(mSavedState);
 
         // Update customization drawer _after_ restoring the states
-        mCustomizePagedView.update();
+        if (mCustomizePagedView != null) {
+            mCustomizePagedView.update();
+        }
 
         if (PROFILE_STARTUP) {
             android.os.Debug.stopMethodTracing();