summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2012-04-26 13:43:25 -0700
committerMichael Jurka <mikejurka@google.com>2012-04-26 13:43:25 -0700
commitbafdaafb993ab210761d912cdbb92cd58acc80f1 (patch)
tree8434acadfbd7eae85ac550a2a97d653e889b2b4d /src/com/android
parentc9b5d2b9808653a94a4d830d5fb2f0ecda958f1e (diff)
downloadandroid_packages_apps_Trebuchet-bafdaafb993ab210761d912cdbb92cd58acc80f1.tar.gz
android_packages_apps_Trebuchet-bafdaafb993ab210761d912cdbb92cd58acc80f1.tar.bz2
android_packages_apps_Trebuchet-bafdaafb993ab210761d912cdbb92cd58acc80f1.zip
Fix NPE
Bug: 6394159 Change-Id: Idd7c94b4c8698a9f6a35e5da5ea8306a952084e8
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher2/Launcher.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index 2829e3cae..7b9b36e87 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();
}