OSDN Git Service

Fix NPE if workspace is not created yet
authorDave Hawkey <dhawkey@google.com>
Mon, 30 Sep 2013 17:52:21 +0000 (11:52 -0600)
committerDave Hawkey <dhawkey@google.com>
Mon, 30 Sep 2013 17:52:49 +0000 (11:52 -0600)
Change-Id: I0c8976a8497e2059ec7b2cda3d56eb965a532765

src/com/android/launcher3/Launcher.java

index ba34c13..2b08bf0 100644 (file)
@@ -492,7 +492,7 @@ public class Launcher extends Activity
      * ensure the custom content page is added or removed if necessary.
      */
     protected void invalidateHasCustomContentToLeft() {
-        if (mWorkspace.getScreenOrder().isEmpty()) {
+        if (mWorkspace == null || mWorkspace.getScreenOrder().isEmpty()) {
             // Not bound yet, wait for bindScreens to be called.
             return;
         }