summaryrefslogtreecommitdiffstats
path: root/services/backup/java
diff options
context:
space:
mode:
authorChristopher Tate <ctate@google.com>2014-08-26 18:09:05 -0700
committerChristopher Tate <ctate@google.com>2014-08-26 18:32:55 -0700
commit915f1dc785886ecd14a5222778f7d46f0243b1f5 (patch)
treee1419b3a431e4f62a40a7fa30618972c848b4700 /services/backup/java
parent70613dbff74544c6f537cc3a84392e07ad70859c (diff)
downloadframeworks_base-915f1dc785886ecd14a5222778f7d46f0243b1f5.zip
frameworks_base-915f1dc785886ecd14a5222778f7d46f0243b1f5.tar.gz
frameworks_base-915f1dc785886ecd14a5222778f7d46f0243b1f5.tar.bz2
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
Diffstat (limited to 'services/backup/java')
-rw-r--r--services/backup/java/com/android/server/backup/BackupManagerService.java6
1 files 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 9674ca2..de5e7cb 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);