commit 82398369f3a925ce15a37a968d050a4de422c7fa
author Adam Cohen <adamcohen@google.com> Sun Sep 29 12:57:34 2013 -0700
committer Adam Cohen <adamcohen@google.com> Sun Sep 29 12:58:39 2013 -0700
tree 47c3e5367138a7846c63b0100e3635a55d2b44bc
parent 8ad682ddda37ce6bc438895f3adb8617244d0e46

Fixing NPE in onFinishBindingItems (issue 10975740)

-> See bug for explanation. Seems like the circumstances leading to this
   NPE are understandable.

Change-Id: I89637a2da50be1081632e05cf79678c983a74d3a

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