PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "backup keys that might have slipped past" into jb-ub-now-kermit

Browse Source
This commit is contained in:
Chris Wren
2014-01-14 15:15:04 +00:00
committed by Android (Google) Code Review
parent dc9c125236 5743aa9a86
commit 1ae293c647
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherBackupHelper.java
+6 -4
View File
@@ -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);
}