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

* commit 'c6be6eec2800e4908ef9b5ff86b8c185dfa19030': Fix NPE if workspace is not created yet
2013-10-02 05:59:22 -07:00
parent 625863ef3a c6be6eec28
commit c91d28ba55
1 changed files with 1 additions and 1 deletions
@@ -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;
        }