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

Merge "[FSD2D] Pass eligibility rules to TarBackupReader#chooseRestorePolicy"

Browse Source
This commit is contained in:
TreeHugger Robot
2020-09-07 08:28:36 +00:00
committed by Android (Google) Code Review
parent 0944c0bf93 a2a1e46c72
commit 13b0184efc
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/backup/java/com/android/server/backup/restore/FullRestoreEngine.java
View File

@@ -228,7 +228,7 @@ public class FullRestoreEngine extends RestoreEngine {
PackageManagerInternal.class);
RestorePolicy restorePolicy = tarBackupReader.chooseRestorePolicy(
mBackupManagerService.getPackageManager(), allowApks, info, signatures,
pmi, mUserId);
pmi, mUserId, mBackupEligibilityRules);
mManifestSignatures.put(info.packageName, signatures);
mPackagePolicies.put(pkg, restorePolicy);
mPackageInstallers.put(pkg, info.installerPackageName);

20
services/backup/java/com/android/server/backup/utils/TarBackupReader.java
View File

@@ -389,13 +389,29 @@ public class TarBackupReader {
public RestorePolicy chooseRestorePolicy(PackageManager packageManager,
boolean allowApks, FileMetadata info, Signature[] signatures,
PackageManagerInternal pmi, int userId) {
return chooseRestorePolicy(packageManager, allowApks, info, signatures, pmi, userId,
BackupEligibilityRules.forBackup(packageManager, pmi, userId));
}
/**
* Chooses restore policy.
*
* @param packageManager - PackageManager instance.
* @param allowApks - allow restore set to include apks.
* @param info - file metadata.
* @param signatures - array of signatures parsed from backup file.
* @param userId - ID of the user for which restore is performed.
* @param eligibilityRules - {@link BackupEligibilityRules} for this operation.
* @return a restore policy constant.
*/
public RestorePolicy chooseRestorePolicy(PackageManager packageManager,
boolean allowApks, FileMetadata info, Signature[] signatures,
PackageManagerInternal pmi, int userId, BackupEligibilityRules eligibilityRules) {
if (signatures == null) {
return RestorePolicy.IGNORE;
}
RestorePolicy policy = RestorePolicy.IGNORE;
BackupEligibilityRules eligibilityRules = BackupEligibilityRules.forBackup(packageManager,
pmi, userId);
// Okay, got the manifest info we need...
try {
PackageInfo pkgInfo = packageManager.getPackageInfoAsUser(