From b68e03a83cfc8e59c0c93d070c5e3cc13cc2996b Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 11 Apr 2013 11:36:41 -0700
Subject: Fix NPE

Bug: 8596760
Change-Id: I401aa0f9a1b8b1c167b502f6aad11cb0f98b7c33
---
 src/com/android/launcher2/Launcher.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/com')

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2c0f6b05d..b2c36ee07 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1293,7 +1293,11 @@ public final class Launcher extends Activity
                         final ViewTreeObserver.OnDrawListener listener = this;
                         mWorkspace.post(new Runnable() {
                                 public void run() {
-                                    mWorkspace.getViewTreeObserver().removeOnDrawListener(listener);
+                                    if (mWorkspace != null &&
+                                            mWorkspace.getViewTreeObserver() != null) {
+                                        mWorkspace.getViewTreeObserver().
+                                                removeOnDrawListener(listener);
+                                    }
                                 }
                             });
                         return;
-- 
cgit v1.2.3