diff options
| author | Christopher Tate <ctate@google.com> | 2014-12-04 17:20:28 -0800 |
|---|---|---|
| committer | Christopher Tate <ctate@google.com> | 2014-12-04 19:38:55 -0800 |
| commit | 22192ada99691221f9ab167c046fb71c23baf723 (patch) | |
| tree | 3367f0e0feeb60a64d1cacc8b00f5c8784ff7d26 /services/backup | |
| parent | 6dfa60f33ca6018959ebff1efde82db7d2aed1e3 (diff) | |
| download | frameworks_base-22192ada99691221f9ab167c046fb71c23baf723.zip frameworks_base-22192ada99691221f9ab167c046fb71c23baf723.tar.gz frameworks_base-22192ada99691221f9ab167c046fb71c23baf723.tar.bz2 | |
Correctly parse previous PMBA state during backup
Bug 18628030
Change-Id: Iefa23de50dd9e1b27cfa5d887f117876d57e4083
Diffstat (limited to 'services/backup')
| -rw-r--r-- | services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java index fcca788..4f7e57f 100644 --- a/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java +++ b/services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java @@ -220,7 +220,7 @@ public class PackageManagerBackupAgent extends BackupAgent { // OR 3. it looks like we use the same home app + version as before, but // the signatures don't match so we treat them as different apps. final boolean needHomeBackup = (homeVersion != mStoredHomeVersion) - || Objects.equals(home, mStoredHomeComponent) + || !Objects.equals(home, mStoredHomeComponent) || (home != null && !BackupManagerService.signaturesMatch(mStoredHomeSigHashes, homeInfo)); if (needHomeBackup) { @@ -534,6 +534,7 @@ public class PackageManagerBackupAgent extends BackupAgent { + ", redoing from start"); return; } + pkg = in.readUTF(); } else { // This is an older version of the state file in which the lead element // is not a STATE_FILE_VERSION string. If that's the case, we want to |