diff options
| author | Dave Hawkey <dhawkey@google.com> | 2013-10-01 22:56:46 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-01 22:56:47 +0000 |
| commit | c6be6eec2800e4908ef9b5ff86b8c185dfa19030 (patch) | |
| tree | 4ea7174b4162d14d5af079d08c6622da8fb04e08 /src | |
| parent | 9cfd586305826bb1da725cfd6956cf201195e692 (diff) | |
| parent | 3a733a77e32ea112516b4a7ef0b571d6bcc51315 (diff) | |
| download | android_packages_apps_Trebuchet-c6be6eec2800e4908ef9b5ff86b8c185dfa19030.tar.gz android_packages_apps_Trebuchet-c6be6eec2800e4908ef9b5ff86b8c185dfa19030.tar.bz2 android_packages_apps_Trebuchet-c6be6eec2800e4908ef9b5ff86b8c185dfa19030.zip | |
Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose
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 c131aac47..831637ffa 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -497,7 +497,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; } |