diff options
| author | Adrian Roos <roosa@google.com> | 2014-04-28 15:45:52 +0200 |
|---|---|---|
| committer | Adrian Roos <roosa@google.com> | 2014-04-28 15:45:55 +0200 |
| commit | 8f3f6830f2693647034e8df974d67f6b50d01602 (patch) | |
| tree | c092c0067e74a395a57a19478101bcb914f3931c /src/com/android/launcher3/ItemInfo.java | |
| parent | 4ff73887f28b831e8da38f2c417d55350ad88956 (diff) | |
| download | android_packages_apps_Trebuchet-8f3f6830f2693647034e8df974d67f6b50d01602.tar.gz android_packages_apps_Trebuchet-8f3f6830f2693647034e8df974d67f6b50d01602.tar.bz2 android_packages_apps_Trebuchet-8f3f6830f2693647034e8df974d67f6b50d01602.zip | |
Sanity check screenId before persisting ItemInfo.
Bug: 13447571
Change-Id: I014dcf1eb313c2312953716fb53e542caaeb285b
Diffstat (limited to 'src/com/android/launcher3/ItemInfo.java')
| -rw-r--r-- | src/com/android/launcher3/ItemInfo.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/android/launcher3/ItemInfo.java b/src/com/android/launcher3/ItemInfo.java index 9ac9edfbc..12bbee780 100644 --- a/src/com/android/launcher3/ItemInfo.java +++ b/src/com/android/launcher3/ItemInfo.java @@ -132,7 +132,7 @@ public class ItemInfo { * * @param values */ - void onAddToDatabase(ContentValues values) { + void onAddToDatabase(ContentValues values) { values.put(LauncherSettings.BaseLauncherColumns.ITEM_TYPE, itemType); values.put(LauncherSettings.Favorites.CONTAINER, container); values.put(LauncherSettings.Favorites.SCREEN, screenId); @@ -140,6 +140,11 @@ public class ItemInfo { values.put(LauncherSettings.Favorites.CELLY, cellY); values.put(LauncherSettings.Favorites.SPANX, spanX); values.put(LauncherSettings.Favorites.SPANY, spanY); + + if (screenId == Workspace.EXTRA_EMPTY_SCREEN_ID) { + // We should never persist an item on the extra empty screen. + throw new RuntimeException("Screen id should not be EXTRA_EMPTY_SCREEN_ID"); + } } void updateValuesWithCoordinates(ContentValues values, int cellX, int cellY) { |