commit d3f035797e85cae0d64ddc1be58dcc88ac246109
author Sunny Goyal <sunnygoyal@google.com> Wed Feb 11 23:01:53 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Feb 11 23:01:53 2015 +0000
tree 473aa35d4b336a60450cdadd0078db903468a820
parent 09cd92221e407810c2f83ab2305f42bb47197e1b
parent c87775d8e63c7b5722c23ef95c782f574b847d73

am c87775d8: Fixing rank migration code to handle null values correctly.

* commit 'c87775d8e63c7b5722c23ef95c782f574b847d73':
  Fixing rank migration code to handle null values correctly.

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index 196f57c..4fa3696 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -620,7 +620,8 @@
                         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)});
                 }