diff options
| author | Michael Jurka <mikejurka@google.com> | 2012-04-26 14:01:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-26 14:01:17 -0700 |
| commit | 840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d (patch) | |
| tree | fece4076cf714e9354753c9b4800ef2975e2ed4f /src | |
| parent | 0078570ca1323ea418306a70d091f8694de5ac9b (diff) | |
| parent | bafdaafb993ab210761d912cdbb92cd58acc80f1 (diff) | |
| download | android_packages_apps_Trebuchet-840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d.tar.gz android_packages_apps_Trebuchet-840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d.tar.bz2 android_packages_apps_Trebuchet-840ebf6277c8eea38b6a4f03cd8bb4e09bd69c7d.zip | |
Merge "Fix NPE" into jb-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 4 |
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(); } |