commit 8da91f7cbecdb466b71072be602afcb3aca7cee6
author Chris Wren <cwren@android.com> Tue Jan 14 07:16:28 2014 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 14 07:16:28 2014 -0800
tree 676a4ad1b42a89d6ae292e34a24429fa1c6dbb77
parent ebc3b3ae903c00d9f26c7a2f0523892871ab326d
parent 1ae293c647fa44f458625774e2ea119a61814e63

am 1ae293c6: Merge "backup keys that might have slipped past" into jb-ub-now-kermit

* commit '1ae293c647fa44f458625774e2ea119a61814e63':
  backup keys that might have slipped past

src/com/android/launcher3/LauncherBackupHelper.java

diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java
index 704d790..556d4af 100644
--- a/src/com/android/launcher3/LauncherBackupHelper.java
+++ b/src/com/android/launcher3/LauncherBackupHelper.java
@@ -299,8 +299,9 @@
                 final long updateTime = cursor.getLong(ID_MODIFIED);
                 Key key = getKey(Key.FAVORITE, id);
                 keys.add(key);
-                currentIds.add(keyToBackupKey(key));
-                if (updateTime >= in.t) {
+                final String backupKey = keyToBackupKey(key);
+                currentIds.add(backupKey);
+                if (!savedIds.contains(backupKey) || updateTime >= in.t) {
                     byte[] blob = packFavorite(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }
@@ -367,8 +368,9 @@
                 final long updateTime = cursor.getLong(ID_MODIFIED);
                 Key key = getKey(Key.SCREEN, id);
                 keys.add(key);
-                currentIds.add(keyToBackupKey(key));
-                if (updateTime >= in.t) {
+                final String backupKey = keyToBackupKey(key);
+                currentIds.add(backupKey);
+                if (!savedIds.contains(backupKey) || updateTime >= in.t) {
                     byte[] blob = packScreen(cursor);
                     writeRowToBackup(key, blob, out, data);
                 }