summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Artem Iglikov <artikz@google.com> 2017-04-27 09:40:38 +0100
committer Artem Iglikov <artikz@google.com> 2017-04-27 09:40:38 +0100
commitb9d55570cbf5e10aad3d9c66fa49f885eaf2604a (patch)
treeb78c20ef4ebc0d8c492fcce912b1da45610ac05f
parent540607b6d9de6d04e3e54bf0253fd5a598216639 (diff)
Fix missing read of widget data in adb restore.
This was done for FullRestoreEngine but not for PerformAdbRestoreTask by mistake. Bug: 37519282 Test: it compiles Change-Id: I17be3f07d3eed9113c36bbb47db6146fa7e76d64
-rw-r--r--services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java b/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java
index 7a749ea86e4a..d99fc531c9ea 100644
--- a/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java
+++ b/services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java
@@ -479,6 +479,13 @@ public class PerformAdbRestoreTask implements Runnable {
RefactoredBackupManagerService.BACKUP_METADATA_FILENAME)) {
// Metadata blobs!
tarBackupReader.readMetadata(info);
+
+ // The following only exist because we want to keep refactoring as safe as
+ // possible, without changing too much.
+ // TODO: Refactor, so that there are no funny things like this.
+ // This is read during TarBackupReader.readMetadata().
+ mWidgetData = tarBackupReader.getWidgetData();
+
tarBackupReader.skipTarPadding(info.size);
} else {
// Non-manifest, so it's actual file data. Is this a package