Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ae293c6 authored by Chris Wren's avatar Chris Wren Committed by Android (Google) Code Review
Browse files

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

parents dc9c1252 5743aa9a

src/com/android/launcher3/LauncherBackupHelper.java

+6 −4
Original line number Diff line number Diff line
@@ -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);

                }