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

Commit e15df401 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 6132 into donut

* changes:
  If we can't get the restore set's metadata, don't continue
parents fe11ea5e 8c032475
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -943,6 +943,15 @@ class BackupManagerService extends IBackupManager.Stub {
                        mPackageManager, agentPackages);
                processOneRestore(omPackage, 0, IBackupAgent.Stub.asInterface(pmAgent.onBind()));

                // 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) {
                    Log.i(TAG, "No restore metadata available, so not restoring settings");
                    return;
                }

                int count = 0;
                for (;;) {
                    packageName = mTransport.nextRestorePackage();