From b9d55570cbf5e10aad3d9c66fa49f885eaf2604a Mon Sep 17 00:00:00 2001 From: Artem Iglikov Date: Thu, 27 Apr 2017 09:40:38 +0100 Subject: [PATCH] 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 --- .../server/backup/restore/PerformAdbRestoreTask.java | 7 +++++++ 1 file changed, 7 insertions(+) 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 7a749ea86e4a2..d99fc531c9ea0 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