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

Commit 13fffd26 authored by Artem Iglikov's avatar Artem Iglikov
Browse files

Add some tests for TarBackupReader 

... and PerformAdbRestoreTask.

Involves some refactoring, splitting readAppManifest() into two methods.

Also a bit of cleanup: make private field actually private and use
static imports for some constants.

Bug: 38090803
Bug: 37619463
Test: runtest -p com.android.server.backup frameworks-services
Change-Id: Ic30a6c5a515da1efb67caaae6eb75f4313797d5c
parent 3494f15f

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

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ public class FileMetadata { 
    public long mode;                      // e.g. 0666 (actually int)

    public long mtime;                     // last mod time, UTC time_t (actually int)

    public long size;                      // bytes of content

    public int version;                    // App version.

    public boolean hasApk;                 // Whether backup file contains apk.



    @Override

    public String toString() {

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

+118 −134

File changed.

Preview size limit exceeded, changes collapsed.

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

+235 −216

File changed.

Preview size limit exceeded, changes collapsed.

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

+209 −219

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/servicestests/res/raw/backup_telephony_no_password

0 → 100644
+21.3 KiB

File added.

No diff preview for this file type.

View file