diff options
| author | Dave Hawkey <dhawkey@google.com> | 2013-09-30 11:52:21 -0600 |
|---|---|---|
| committer | Dave Hawkey <dhawkey@google.com> | 2013-09-30 11:52:49 -0600 |
| commit | 3a733a77e32ea112516b4a7ef0b571d6bcc51315 (patch) | |
| tree | 35a5c6cb50a72ad07454764ab27d098e7b1a07fe /src | |
| parent | 0655904abd2e67f3c4c5b9e8e57cee6f8f562076 (diff) | |
| download | android_packages_apps_Trebuchet-3a733a77e32ea112516b4a7ef0b571d6bcc51315.tar.gz android_packages_apps_Trebuchet-3a733a77e32ea112516b4a7ef0b571d6bcc51315.tar.bz2 android_packages_apps_Trebuchet-3a733a77e32ea112516b4a7ef0b571d6bcc51315.zip | |
Fix NPE if workspace is not created yet
Change-Id: I0c8976a8497e2059ec7b2cda3d56eb965a532765
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index ba34c136c..2b08bf043 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -492,7 +492,7 @@ public class Launcher extends Activity * ensure the custom content page is added or removed if necessary. */ protected void invalidateHasCustomContentToLeft() { - if (mWorkspace.getScreenOrder().isEmpty()) { + if (mWorkspace == null || mWorkspace.getScreenOrder().isEmpty()) { // Not bound yet, wait for bindScreens to be called. return; } |