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

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

am e15df401: Merge change 6132 into donut 

Merge commit 'e15df401'

* commit 'e15df401':
  If we can't get the restore set's metadata, don't continue
parents 85c21679 e15df401

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

+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();