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

Merge "Correctly parse previous PMBA state during backup" into lmp-mr1-dev

Browse Source
This commit is contained in:
Christopher Tate
2014-12-05 20:05:09 +00:00
committed by Android (Google) Code Review
parent 8ec2dc00e5 22192ada99
commit 2aa909f0ab
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/backup/java/com/android/server/backup/PackageManagerBackupAgent.java
View File

@@ -220,7 +220,7 @@ public class PackageManagerBackupAgent extends BackupAgent {
// OR 3. it looks like we use the same home app + version as before, but // 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. // the signatures don't match so we treat them as different apps.
final boolean needHomeBackup = (homeVersion != mStoredHomeVersion) final boolean needHomeBackup = (homeVersion != mStoredHomeVersion)
|| Objects.equals(home, mStoredHomeComponent) || !Objects.equals(home, mStoredHomeComponent)
|| (home != null || (home != null
&& !BackupManagerService.signaturesMatch(mStoredHomeSigHashes, homeInfo)); && !BackupManagerService.signaturesMatch(mStoredHomeSigHashes, homeInfo));
if (needHomeBackup) { if (needHomeBackup) {
@@ -534,6 +534,7 @@ public class PackageManagerBackupAgent extends BackupAgent {
+ ", redoing from start"); + ", redoing from start");
return; return;
} }
pkg = in.readUTF();
} else { } else {
// This is an older version of the state file in which the lead element // 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 // is not a STATE_FILE_VERSION string. If that's the case, we want to