commit | d0afc87d9639a228b247cfbc2cf19d16132137b3 | [log] [tgz] |
---|---|---|
author | Joe Onorato <joeo@android.com> | Fri Jun 11 00:03:15 2010 -0700 |
committer | Joe Onorato <joeo@android.com> | Fri Jun 11 00:03:15 2010 -0700 |
tree | 53b49093adca12b932da2f7115b62a3c35358dc9 | |
parent | a9bda02f7c931f7c4414c0cf8d64e3559c701bcd [diff] |
Fix crash in getCurrentWorkspaceScreen. Bug 2761789 Change-Id: I9f005c876ca20f774e6d8046e34451a7fecbe805
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 13a39a3..6bd915a 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java
@@ -2093,7 +2093,11 @@ * Implementation of the method from LauncherModel.Callbacks. */ public int getCurrentWorkspaceScreen() { - return mWorkspace.getCurrentScreen(); + if (mWorkspace != null) { + return mWorkspace.getCurrentScreen(); + } else { + return SCREEN_COUNT / 2; + } } /**