commit c6be6eec2800e4908ef9b5ff86b8c185dfa19030
author Dave Hawkey <dhawkey@google.com> Tue Oct 01 22:56:46 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 01 22:56:47 2013 +0000
tree 4ea7174b4162d14d5af079d08c6622da8fb04e08
parent 9cfd586305826bb1da725cfd6956cf201195e692
parent 3a733a77e32ea112516b4a7ef0b571d6bcc51315

Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index c131aac..831637f 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -497,7 +497,7 @@
      * 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;
         }