commit fa7969fbd587d8eb2e43093a83fcad85e2b91726
author Michael Jurka <mikejurka@google.com> Fri Sep 21 16:39:14 2012 -0700
committer Michael Jurka <mikejurka@google.com> Fri Sep 21 16:39:14 2012 -0700
tree 46bd1577e9e28e01a6bfa4b88b684c60fa97b0bd
parent e5574e0b7316890bcbce2465e632a04049b57769

Fix NPE

Bug: 7024933

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();