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

Commit 9c15a29b authored by Artem Iglikov's avatar Artem Iglikov
Browse files

Move common tar reading parts to separate class. 

This moves part of the common code for reading tar files from
PerformAdbRestoreTask and FullRestoreEngine to it's own class.

Change is mostly automated, but with some manual intervention which
doesn't change behaviour.

Bug: 37519282
Test: cts,gts,pts
Change-Id: I669b848e16196ae76fb9e820b786bbe248985e47
parent add429d1

services/backup/java/com/android/server/backup/RefactoredBackupManagerService.java

+0 −13
Original line number Diff line number Diff line
@@ -178,19 +178,6 @@ public class RefactoredBackupManagerService implements BackupManagerServiceInter 
    public static final int BACKUP_METADATA_VERSION = 1;

    public static final int BACKUP_WIDGET_METADATA_TOKEN = 0x01FFED01;



    public static final int TAR_HEADER_LONG_RADIX = 8;

    public static final int TAR_HEADER_OFFSET_FILESIZE = 124;

    public static final int TAR_HEADER_LENGTH_FILESIZE = 12;

    public static final int TAR_HEADER_OFFSET_MODTIME = 136;

    public static final int TAR_HEADER_LENGTH_MODTIME = 12;

    public static final int TAR_HEADER_OFFSET_MODE = 100;

    public static final int TAR_HEADER_LENGTH_MODE = 8;

    public static final int TAR_HEADER_OFFSET_PATH_PREFIX = 345;

    public static final int TAR_HEADER_LENGTH_PATH_PREFIX = 155;

    public static final int TAR_HEADER_OFFSET_PATH = 0;

    public static final int TAR_HEADER_LENGTH_PATH = 100;

    public static final int TAR_HEADER_OFFSET_TYPE_CHAR = 156;



    private static final boolean COMPRESS_FULL_BACKUPS = true; // should be true in production



    public static final String SETTINGS_PACKAGE = "com.android.providers.settings";

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

+32 −352

File changed.

Preview size limit exceeded, changes collapsed.

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

+25 −322

File changed.

Preview size limit exceeded, changes collapsed.

services/backup/java/com/android/server/backup/utils/TarBackupReader.java

0 → 100644
+391 −0

File added.

Preview size limit exceeded, changes collapsed.