Merge "Fix NPE" into jb-dev

This commit is contained in:
Michael Jurka
2012-04-26 14:01:17 -07:00
committed by Android (Google) Code Review

View File

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