commit c814031b354c7e8c44ef55c301d4ff1242a04d12
author Michael Jurka <mikejurka@google.com> Fri Nov 16 18:30:29 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 16 18:30:29 2012 -0800
tree efb9c1dff67167d93aa6a3d5c19968786593710b
parent 14bad2ad9508e4bf48142e0302c970cb67550287
parent aa01c0882b8fcab73550546602b174bb36f72bce

am aa01c088: am ffc2682a: Fix NPE

* commit 'aa01c0882b8fcab73550546602b174bb36f72bce':
  Fix NPE

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index ffd63d2..f0077a6 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -1403,6 +1403,10 @@
 
             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();