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

Commit b9d55570 authored by Artem Iglikov's avatar Artem Iglikov
Browse files

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
parent 540607b6

services/backup/java/com/android/server/backup/restore/PerformAdbRestoreTask.java

+7 −0
Original line number Diff line number Diff line
@@ -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