diff options
| author | Joe Onorato <joeo@android.com> | 2010-06-11 11:15:10 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-11 11:15:10 -0700 |
| commit | 9d944c6fb8c117674d1f02ca567629ab62add6b8 (patch) | |
| tree | 25abf254d529250bebff4b77509a8daf3e8c3e92 /src | |
| parent | ce6160d7c3c0e791fad8498aaffe9b5ef25d5209 (diff) | |
| parent | d0afc87d9639a228b247cfbc2cf19d16132137b3 (diff) | |
| download | android_packages_apps_Trebuchet-9d944c6fb8c117674d1f02ca567629ab62add6b8.tar.gz android_packages_apps_Trebuchet-9d944c6fb8c117674d1f02ca567629ab62add6b8.tar.bz2 android_packages_apps_Trebuchet-9d944c6fb8c117674d1f02ca567629ab62add6b8.zip | |
am d0afc87d: Fix crash in getCurrentWorkspaceScreen.
Merge commit 'd0afc87d9639a228b247cfbc2cf19d16132137b3'
* commit 'd0afc87d9639a228b247cfbc2cf19d16132137b3':
Fix crash in getCurrentWorkspaceScreen.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher2/Launcher.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 13a39a3a3..6bd915aa0 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -2093,7 +2093,11 @@ public final class Launcher extends Activity * Implementation of the method from LauncherModel.Callbacks. */ public int getCurrentWorkspaceScreen() { - return mWorkspace.getCurrentScreen(); + if (mWorkspace != null) { + return mWorkspace.getCurrentScreen(); + } else { + return SCREEN_COUNT / 2; + } } /** |