diff options
| author | Chris Wren <cwren@android.com> | 2014-01-14 15:15:04 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-14 15:15:04 +0000 |
| commit | 1ae293c647fa44f458625774e2ea119a61814e63 (patch) | |
| tree | 65cfd0fc9103aeb62a72cffbe50c864d786b002c /src/com/android/launcher3/LauncherBackupHelper.java | |
| parent | dc9c125236c9eab434b7c909d18f748c645c8118 (diff) | |
| parent | 5743aa9a86b7f559d9beb09c223dad8e3913c5c6 (diff) | |
| download | android_packages_apps_Trebuchet-1ae293c647fa44f458625774e2ea119a61814e63.tar.gz android_packages_apps_Trebuchet-1ae293c647fa44f458625774e2ea119a61814e63.tar.bz2 android_packages_apps_Trebuchet-1ae293c647fa44f458625774e2ea119a61814e63.zip | |
Merge "backup keys that might have slipped past" into jb-ub-now-kermit
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 704d790da..556d4af79 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -299,8 +299,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); } @@ -367,8 +368,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); } |