Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am e15df401: Merge change 6132 into donut

Browse Source 
Merge commit 'e15df4017c3625de700e9f9953073f38898bbc89'

* commit 'e15df4017c3625de700e9f9953073f38898bbc89':
  If we can't get the restore set's metadata, don't continue
This commit is contained in:
Android (Google) Code Review
2009-07-06 11:16:58 -07:00
committed by The Android Open Source Project
parent 85c216794d e15df4017c
commit 3d20432649
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/java/com/android/server/BackupManagerService.java
View File

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