diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-09-21 16:39:14 -0700 |
|---|---|---|
| committer | Michael Jurka <mikejurka@google.com> | 2012-09-21 16:39:14 -0700 |
| commit | fa7969fbd587d8eb2e43093a83fcad85e2b91726 (patch) | |
| tree | 46bd1577e9e28e01a6bfa4b88b684c60fa97b0bd /src/com/android/launcher2/Launcher.java | |
| parent | e5574e0b7316890bcbce2465e632a04049b57769 (diff) | |
| download | android_packages_apps_Trebuchet-fa7969fbd587d8eb2e43093a83fcad85e2b91726.tar.gz android_packages_apps_Trebuchet-fa7969fbd587d8eb2e43093a83fcad85e2b91726.tar.bz2 android_packages_apps_Trebuchet-fa7969fbd587d8eb2e43093a83fcad85e2b91726.zip | |
Fix NPE
Bug: 7024933
Diffstat (limited to 'src/com/android/launcher2/Launcher.java')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 8c73c2949..4ae9c7d26 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2507,7 +2507,7 @@ public final class Launcher extends Activity 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(); |