commit bafdaafb993ab210761d912cdbb92cd58acc80f1
author Michael Jurka <mikejurka@google.com> Thu Apr 26 13:43:25 2012 -0700
committer Michael Jurka <mikejurka@google.com> Thu Apr 26 13:43:25 2012 -0700
tree 8434acadfbd7eae85ac550a2a97d653e889b2b4d
parent c9b5d2b9808653a94a4d830d5fb2f0ecda958f1e

Fix NPE

Bug: 6394159
Change-Id: Idd7c94b4c8698a9f6a35e5da5ea8306a952084e8

src/com/android/launcher2/Launcher.java

diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2829e3c..7b9b36e 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -2452,7 +2452,9 @@
                     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();
                     }