diff options
| author | Chris Wren <cwren@android.com> | 2014-01-10 18:02:06 -0500 |
|---|---|---|
| committer | Danesh M <daneshm90@gmail.com> | 2014-06-06 22:54:24 -0700 |
| commit | 5cef825846f813cddb31f83624c2efdc1704e092 (patch) | |
| tree | 881ef26aacdc2ecd48cc4247b766356ffa20c63b /src/com/android | |
| parent | 261ddc3cc7cdaa516e67d15d0cd9beca666983a2 (diff) | |
| download | android_packages_apps_Trebuchet-5cef825846f813cddb31f83624c2efdc1704e092.tar.gz android_packages_apps_Trebuchet-5cef825846f813cddb31f83624c2efdc1704e092.tar.bz2 android_packages_apps_Trebuchet-5cef825846f813cddb31f83624c2efdc1704e092.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')
| -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 0c638fa7f..fa6a3188a 100644 --- a/src/com/android/launcher3/LauncherBackupHelper.java +++ b/src/com/android/launcher3/LauncherBackupHelper.java @@ -297,8 +297,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); } @@ -365,8 +366,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); } |