commit 7beccc08e3a90afd0732a187ba48ea5daaa5f9bb
author Michael Jurka <mikejurka@google.com> Fri Sep 21 17:08:38 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 21 17:08:38 2012 -0700
tree 46bd1577e9e28e01a6bfa4b88b684c60fa97b0bd
parent 26a16c24d72194c7a85b66cb4f90756ec4fb4597
parent fa7969fbd587d8eb2e43093a83fcad85e2b91726

am fa7969fb: Fix NPE

* commit 'fa7969fbd587d8eb2e43093a83fcad85e2b91726':
  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();