commit befe710322675487b22937c319448a1790e201a1
author Michael Jurka <mikejurka@google.com> Mon Sep 24 00:52:05 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 24 00:52:05 2012 -0700
tree 83e9e6f97177d8c0a079f6101c0a3e118fa16ecc
parent b3f27f30fcdd7b5c3e03d705bd567d64f671a374
parent 7beccc08e3a90afd0732a187ba48ea5daaa5f9bb

am 7beccc08: am fa7969fb: Fix NPE

* commit '7beccc08e3a90afd0732a187ba48ea5daaa5f9bb':
  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 8c73c29..4ae9c7d 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2507,7 +2507,7 @@
                     dispatchOnLauncherTransitionEnd(fromView, animated, false);
                     dispatchOnLauncherTransitionEnd(toView, animated, false);
 
-                    if (!springLoaded && !LauncherApplication.isScreenLarge()) {
+                    if (mWorkspace != null && !springLoaded && !LauncherApplication.isScreenLarge()) {
                         // Hide the workspace scrollbar
                         mWorkspace.hideScrollingIndicator(true);
                         hideDockDivider();