From 6f317426e49e73ef3e50d8839877504039cd2fca Mon Sep 17 00:00:00 2001 From: Christopher Tate Date: Mon, 29 Jun 2009 18:52:55 -0700 Subject: [PATCH] Don't issue a deletion for the global metadata backup We were accidentally submitting a deletion for the global metadata key in the PM backup handling (it was falling into the usual "here's a package that we said we'd backed up last time, but now it's no longer on device" code). Don't do that any more, i.e. actually keep the global metadata key in the backup set. Oops. --- .../java/com/android/server/PackageManagerBackupAgent.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/java/com/android/server/PackageManagerBackupAgent.java b/services/java/com/android/server/PackageManagerBackupAgent.java index 66fb86d9252d3..16f14e82e067a 100644 --- a/services/java/com/android/server/PackageManagerBackupAgent.java +++ b/services/java/com/android/server/PackageManagerBackupAgent.java @@ -120,7 +120,10 @@ public class PackageManagerBackupAgent extends BackupAgent { // write its signature block to the output, keyed on the package name. for (PackageInfo pkg : mAllPackages) { String packName = pkg.packageName; - if (!existing.contains(packName)) { + if (packName.equals(GLOBAL_METADATA_KEY)) { + // We've already handled the metadata key; skip it here + continue; + } else if (!existing.contains(packName)) { // We haven't stored this app's signatures yet, so we do that now try { PackageInfo info = mPackageManager.getPackageInfo(packName,