From c87775d8e63c7b5722c23ef95c782f574b847d73 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Tue, 10 Feb 2015 19:52:36 -0800
Subject: [PATCH] Fixing rank migration code to handle null values correctly.

Bug: 19297508
Change-Id: I652ef30ab37f5b09204f0388de8e065d64b7724d
---
 src/com/android/launcher3/LauncherProvider.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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