From bafdaafb993ab210761d912cdbb92cd58acc80f1 Mon Sep 17 00:00:00 2001
From: Michael Jurka <mikejurka@google.com>
Date: Thu, 26 Apr 2012 13:43:25 -0700
Subject: [PATCH] Fix NPE

Bug: 6394159
Change-Id: Idd7c94b4c8698a9f6a35e5da5ea8306a952084e8
---
 src/com/android/launcher2/Launcher.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2829e3cae7..7b9b36e870 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2452,7 +2452,9 @@ public final class Launcher extends Activity
                     fromView.setVisibility(View.GONE);
                     dispatchOnLauncherTransitionEnd(fromView, animated, true);
                     dispatchOnLauncherTransitionEnd(toView, animated, true);
-                    mWorkspace.hideScrollingIndicator(false);
+                    if (mWorkspace != null) {
+                        mWorkspace.hideScrollingIndicator(false);
+                    }
                     if (onCompleteRunnable != null) {
                         onCompleteRunnable.run();
                     }