diff options
| author | Chris Wren <cwren@android.com> | 2014-01-10 18:02:06 -0500 |
|---|---|---|
| committer | Chris Wren <cwren@android.com> | 2014-01-13 08:43:14 -0500 |
| commit | 5743aa9a86b7f559d9beb09c223dad8e3913c5c6 (patch) | |
| tree | 32ccda7282cdc7a16d8f8a6759ca77d127017c4f /src/com/android/launcher3/LauncherBackupHelper.java | |
| parent | 5317c2b7adfbfef97edc6ad9b7e007160ef689f4 (diff) | |
| download | android_packages_apps_Trebuchet-5743aa9a86b7f559d9beb09c223dad8e3913c5c6.tar.gz android_packages_apps_Trebuchet-5743aa9a86b7f559d9beb09c223dad8e3913c5c6.tar.bz2 android_packages_apps_Trebuchet-5743aa9a86b7f559d9beb09c223dad8e3913c5c6.zip | |
backup keys that might have slipped past
seems a little paranoid, but can't hurt.
Bug: 12455866
Change-Id: If9da4cc021ee4fac32c822a91fabda69bf3ff8aa
Diffstat (limited to 'src/com/android/launcher3/LauncherBackupHelper.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherBackupHelper.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/com/android/launcher3/LauncherBackupHelper.java b/src/com/android/launcher3/LauncherBackupHelper.java index a081c2191..4e70e6efd 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -296,8 +296,9 @@ public class LauncherBackupHelper implements BackupHelper { 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); } @@ -364,8 +365,9 @@ public class LauncherBackupHelper implements BackupHelper { 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); } |