summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2013-08-21 19:10:29 -0700
committerWinson Chung <winsonc@google.com>2013-08-21 19:10:49 -0700
commit61c69869b3947f1d242b07384bb4e9cd5b266915 (patch)
treed8b43d58ad14054be971627f745f5b472eb58d03 /src
parent2b931429dbf29633657f060151e5451522b44f15 (diff)
downloadandroid_packages_apps_Trebuchet-61c69869b3947f1d242b07384bb4e9cd5b266915.tar.gz
android_packages_apps_Trebuchet-61c69869b3947f1d242b07384bb4e9cd5b266915.tar.bz2
android_packages_apps_Trebuchet-61c69869b3947f1d242b07384bb4e9cd5b266915.zip
Fixing issue loading old db rows without proper spans causing crash due to occupied-cells check.
Change-Id: Iac4d245c27aa7e6afe7792cc2308a163af11d11f
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherModel.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java
index e8103f53d..d80c2ac7c 100644
--- a/src/com/android/launcher3/LauncherModel.java
+++ b/src/com/android/launcher3/LauncherModel.java
@@ -784,8 +784,8 @@ public class LauncherModel extends BroadcastReceiver {
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);