From 915f1dc785886ecd14a5222778f7d46f0243b1f5 Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Tue, 26 Aug 2014 18:09:05 -0700 Subject: [PATCH] Remember having done full-data as well as key/value app backups The "what have we ever succesfully backed up?" log is used to determine whether we can do an install-time restore from the currently-live dataset rather than go back to the ancestral dataset (if any). We now track apps that have gotten a successful full-data backup through the transport, not just key/value backups. Bug 17263823 Change-Id: If21350a8dd8aaa4ed02fb74101617e935920e4ae --- .../com/android/server/backup/BackupManagerService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index 9674ca2a14944..de5e7cb21198e 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -1963,8 +1963,9 @@ public class BackupManagerService extends IBackupManager.Stub { return packages; } - // Called from the backup task: record that the given app has been successfully - // backed up at least once + // Called from the backup tasks: record that the given app has been successfully + // backed up at least once. This includes both key/value and full-data backups + // through the transport. void logBackupComplete(String packageName) { if (packageName.equals(PACKAGE_MANAGER_SENTINEL)) return; @@ -3837,6 +3838,7 @@ public class BackupManagerService extends IBackupManager.Stub { // Success! EventLog.writeEvent(EventLogTags.FULL_BACKUP_SUCCESS, currentPackage.packageName); + logBackupComplete(currentPackage.packageName); } cleanUpPipes(transportPipes); cleanUpPipes(enginePipes);