commit 107ea6345bff14ad172013783040bb127deacb61
author Sunny Goyal <sunnygoyal@google.com> Mon Jul 20 12:59:39 2015 -0700
committer Sunny Goyal <sunnygoyal@google.com> Wed Jul 22 16:48:23 2015 -0700
tree 39df0584954a632c24980b0d82953b36d16dd8a5
parent 7e0a403759c401d3b94f4576bca3aa8fb94fe542

Adding rank column in backup

> targetType was only added for M builds, so it can also be considered
  as v4 change. V3 which introduced minSpanX and minSpanY didn't
  contain targetType

Bug: 22417713
Change-Id: I5c353674f7e0c2b5b4ab46e574fdb347d82028cd

src/com/android/launcher3/LauncherBackupAgentHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupAgentHelper.java b/src/com/android/launcher3/LauncherBackupAgentHelper.java
index a92a889..b7860d4 100644
--- a/src/com/android/launcher3/LauncherBackupAgentHelper.java
+++ b/src/com/android/launcher3/LauncherBackupAgentHelper.java
@@ -91,11 +91,12 @@
             LauncherAppState.getLauncherProvider().clearFlagEmptyDbCreated();
             LauncherClings.synchonouslyMarkFirstRunClingDismissed(this);
 
-            // TODO: Update the backup set to include rank.
+            // Rank was added in v4.
             if (mHelper.restoredBackupVersion <= 3) {
                 LauncherAppState.getLauncherProvider().updateFolderItemsRank();
-                LauncherAppState.getLauncherProvider().convertShortcutsToLauncherActivities();
             }
+
+            LauncherAppState.getLauncherProvider().convertShortcutsToLauncherActivities();
         } else {
             if (VERBOSE) Log.v(TAG, "Nothing was restored, clearing DB");
             LauncherAppState.getLauncherProvider().createEmptyDB();