commit 240946d7c8f10d27e5ffc3bafbd88d3babb1ff84
author Dave Hawkey <dhawkey@google.com> Wed Oct 02 06:58:17 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 06:58:17 2013 -0700
tree 4ea7174b4162d14d5af079d08c6622da8fb04e08
parent 19cd84351fdc87a76efa05300688a2db110543a8
parent c91d28ba55a217c8086755dbae0936f6d1b27306

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

* commit 'c91d28ba55a217c8086755dbae0936f6d1b27306':
  Fix NPE if workspace is not created yet

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;
         }