summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2015-02-11 23:01:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-11 23:01:53 +0000
commitd3f035797e85cae0d64ddc1be58dcc88ac246109 (patch)
tree473aa35d4b336a60450cdadd0078db903468a820 /src
parent09cd92221e407810c2f83ab2305f42bb47197e1b (diff)
parentc87775d8e63c7b5722c23ef95c782f574b847d73 (diff)
downloadandroid_packages_apps_Trebuchet-d3f035797e85cae0d64ddc1be58dcc88ac246109.tar.gz
android_packages_apps_Trebuchet-d3f035797e85cae0d64ddc1be58dcc88ac246109.tar.bz2
android_packages_apps_Trebuchet-d3f035797e85cae0d64ddc1be58dcc88ac246109.zip
am c87775d8: Fixing rank migration code to handle null values correctly.
* commit 'c87775d8e63c7b5722c23ef95c782f574b847d73': Fixing rank migration code to handle null values correctly.
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/LauncherProvider.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 196f57c3c..4fa3696a9 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -620,7 +620,8 @@ public class LauncherProvider extends ContentProvider {
new String[] {Integer.toString(LauncherSettings.Favorites.ITEM_TYPE_FOLDER)});
while (c.moveToNext()) {
- db.execSQL("UPDATE favorites SET rank=cellX+(cellY*?) WHERE container=?;",
+ db.execSQL("UPDATE favorites SET rank=cellX+(cellY*?) WHERE "
+ + "container=? AND cellX IS NOT NULL AND cellY IS NOT NULL;",
new Object[] {c.getLong(1) + 1, c.getLong(0)});
}