From ffc2682a9784e03d7cc9943f4f408255f8468b96 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Fri, 16 Nov 2012 18:21:22 -0800
Subject: [PATCH] Fix NPE

Bug: 7441452
---
 src/com/android/launcher2/Launcher.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ffd63d28cc..f0077a6af2 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1403,6 +1403,10 @@ public final class Launcher extends Activity
 
             Runnable processIntent = new Runnable() {
                 public void run() {
+                    if (mWorkspace == null) {
+                        // Can be cases where mWorkspace is null, this prevents a NPE
+                        return;
+                    }
                     Folder openFolder = mWorkspace.getOpenFolder();
                     // In all these cases, only animate if we're already on home
                     mWorkspace.exitWidgetResizeMode();