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

Commit c5ae493b authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am c4cf22e8: Merge change 6403 into donut 

Merge commit 'c4cf22e8'

* commit 'c4cf22e8':
  Fix the metadata-available test during restore
parents 1256f019 c4cf22e8

services/java/com/android/server/BackupManagerService.java

+1 −2
Original line number Diff line number Diff line
@@ -985,8 +985,7 @@ class BackupManagerService extends IBackupManager.Stub { 
                // Verify that the backup set includes metadata.  If not, we can't do

                // signature/version verification etc, so we simply do not proceed with

                // the restore operation.

                Metadata pmMeta = pmAgent.getRestoredMetadata(packageName);

                if (pmMeta == null) {

                if (!pmAgent.hasMetadata()) {

                    Log.i(TAG, "No restore metadata available, so not restoring settings");

                    return;

                }

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

+7 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ public class PackageManagerBackupAgent extends BackupAgent { 
    private final HashSet<String> mExisting = new HashSet<String>();

    private int mStoredSdkVersion;

    private String mStoredIncrementalVersion;

    private boolean mHasMetadata;



    public class Metadata {

        public int versionCode;
@@ -84,6 +85,11 @@ public class PackageManagerBackupAgent extends BackupAgent { 
        mPackageManager = packageMgr;

        mAllPackages = packages;

        mRestoredSignatures = null;

        mHasMetadata = false;

    }



    public boolean hasMetadata() {

        return mHasMetadata;

    }



    public Metadata getRestoredMetadata(String packageName) {
@@ -259,6 +265,7 @@ public class PackageManagerBackupAgent extends BackupAgent { 
                }

                mStoredSdkVersion = storedSdkVersion;

                mStoredIncrementalVersion = in.readUTF();

                mHasMetadata = true;

                // !!! TODO: remove this debugging output

                if (DEBUG) {

                    Log.i(TAG, "Restore set version " + storedSystemVersion