commit bc1f5ba29ba0f155287b7c9e100143122aa6c678
author Adam Cohen <adamcohen@google.com> Sun Sep 29 13:16:49 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Sep 29 13:16:49 2013 -0700
tree 47c3e5367138a7846c63b0100e3635a55d2b44bc
parent 83ed936171b49a1ad13a6ff18e5c186ca5cccf14
parent 1a70a5124fb1041e71fc631c8fab90a86daea546

am 1a70a512: am 82398369: Fixing NPE in onFinishBindingItems (issue 10975740)

* commit '1a70a5124fb1041e71fc631c8fab90a86daea546':
  Fixing NPE in onFinishBindingItems (issue 10975740)

src/com/android/launcher3/Launcher.java

diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index bf12d79..ba34c13 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -915,7 +915,7 @@
     }
 
     protected void onFinishBindingItems() {
-        if (hasCustomContentToLeft() && mWorkspace.hasCustomContent()) {
+        if (mWorkspace != null && hasCustomContentToLeft() && mWorkspace.hasCustomContent()) {
             addCustomContentToLeft();
         }
     }