From 82398369f3a925ce15a37a968d050a4de422c7fa Mon Sep 17 00:00:00 2001
From: Adam Cohen <adamcohen@google.com>
Date: Sun, 29 Sep 2013 12:57:34 -0700
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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