commit c87775d8e63c7b5722c23ef95c782f574b847d73
author Sunny Goyal <sunnygoyal@google.com> Tue Feb 10 19:52:36 2015 -0800
committer Sunny Goyal <sunnygoyal@google.com> Tue Feb 10 19:53:41 2015 -0800
tree 4cc05655b41197ce3c5c76f94226c89a8a64a4e6
parent 8f9a787945c3326791c61b001e786b96e9fc4341

Fixing rank migration code to handle null values correctly.

Bug: 19297508
Change-Id: I652ef30ab37f5b09204f0388de8e065d64b7724d

src/com/android/launcher3/LauncherProvider.java

diff --git a/src/com/android/launcher3/LauncherProvider.java b/src/com/android/launcher3/LauncherProvider.java
index bb6e8c8..0088f26 100644
--- a/src/com/android/launcher3/LauncherProvider.java
+++ b/src/com/android/launcher3/LauncherProvider.java
@@ -638,7 +638,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)});
                 }