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

Commit 2aa909f0 authored by Christopher Tate's avatar Christopher Tate Committed by Android (Google) Code Review
Browse files

Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev

parents 8ec2dc00 22192ada

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

+2 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ public class PackageManagerBackupAgent extends BackupAgent { 
            // OR 3. it looks like we use the same home app + version as before, but

            //       the signatures don't match so we treat them as different apps.

            final boolean needHomeBackup = (homeVersion != mStoredHomeVersion)

                    || Objects.equals(home, mStoredHomeComponent)

                    || !Objects.equals(home, mStoredHomeComponent)

                    || (home != null

                        && !BackupManagerService.signaturesMatch(mStoredHomeSigHashes, homeInfo));

            if (needHomeBackup) {
@@ -534,6 +534,7 @@ public class PackageManagerBackupAgent extends BackupAgent { 
                            + ", redoing from start");

                    return;

                }

                pkg = in.readUTF();

            } else {

                // This is an older version of the state file in which the lead element

                // is not a STATE_FILE_VERSION string.  If that's the case, we want to