commit 61c69869b3947f1d242b07384bb4e9cd5b266915
author Winson Chung <winsonc@google.com> Wed Aug 21 19:10:29 2013 -0700
committer Winson Chung <winsonc@google.com> Wed Aug 21 19:10:49 2013 -0700
tree d8b43d58ad14054be971627f745f5b472eb58d03
parent 2b931429dbf29633657f060151e5451522b44f15

Fixing issue loading old db rows without proper spans causing crash due to occupied-cells check.

Change-Id: Iac4d245c27aa7e6afe7792cc2308a163af11d11f

src/com/android/launcher3/LauncherModel.java

diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e8103f5..d80c2ac 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -784,8 +784,8 @@
                 ItemInfo item = new ItemInfo();
                 item.cellX = c.getInt(cellXIndex);
                 item.cellY = c.getInt(cellYIndex);
-                item.spanX = c.getInt(spanXIndex);
-                item.spanY = c.getInt(spanYIndex);
+                item.spanX = Math.max(1, c.getInt(spanXIndex));
+                item.spanY = Math.max(1, c.getInt(spanYIndex));
                 item.container = c.getInt(containerIndex);
                 item.itemType = c.getInt(itemTypeIndex);
                 item.screenId = c.getInt(screenIndex);