openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix NPE if workspace is not created yet" into jb-ub-now-indigo-rose

This commit is contained in:
Dave Hawkey 2013-10-01 22:56:46 +00:00 committed by Android (Google) Code Review
parent 9cfd586305 3a733a77e3
commit c6be6eec28
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/launcher3/Launcher.java
View File

@ -497,7 +497,7 @@ public class Launcher extends Activity
* ensure the custom content page is added or removed if necessary. * ensure the custom content page is added or removed if necessary.
*/ */
protected void invalidateHasCustomContentToLeft() { protected void invalidateHasCustomContentToLeft() {
if (mWorkspace.getScreenOrder().isEmpty()) { if (mWorkspace == null || mWorkspace.getScreenOrder().isEmpty()) {
// Not bound yet, wait for bindScreens to be called. // Not bound yet, wait for bindScreens to be called.
return; return;
} }