drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the metadata-available test during restore

Browse Source
This commit is contained in:
Christopher Tate
2009-07-07 14:23:07 -07:00
parent a5188a09bd
commit 3d7cd13e77
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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;
}

7
services/java/com/android/server/PackageManagerBackupAgent.java
View File

@ -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