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

Merge "Skip apk verification when collecting certificates." into rvc-dev am: d31dc67d85

Browse Source 
Change-Id: Ic3c1415ae94c2ad70bcf45b20bfa1ca982394fb1
This commit is contained in:
Song Pan
2020-04-27 11:01:53 +00:00
committed by Automerger Merge Worker
parent 23d8cd693f d31dc67d85
commit bdde3c775d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java
View File

@@ -360,7 +360,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub {
* Verify the UID and return the installer package name. * Verify the UID and return the installer package name.
* *
* @return the package name of the installer, or null if it cannot be determined or it is * @return the package name of the installer, or null if it cannot be determined or it is
* installed via adb. * installed via adb.
*/ */
@Nullable @Nullable
private String getInstallerPackageName(Intent intent) { private String getInstallerPackageName(Intent intent) {
@@ -568,7 +568,10 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub {
try (PackageParser2 parser = mParserSupplier.get()) { try (PackageParser2 parser = mParserSupplier.get()) {
ParsedPackage pkg = parser.parsePackage(installationPath, 0, false); ParsedPackage pkg = parser.parsePackage(installationPath, 0, false);
int flags = PackageManager.GET_SIGNING_CERTIFICATES | PackageManager.GET_META_DATA; int flags = PackageManager.GET_SIGNING_CERTIFICATES | PackageManager.GET_META_DATA;
pkg.setSigningDetails(ParsingPackageUtils.collectCertificates(pkg, false)); // APK signatures is already verified elsewhere in PackageManager. We do not need to
// verify it again since it could cause a timeout for large APKs.
pkg.setSigningDetails(
ParsingPackageUtils.collectCertificates(pkg, /* skipVerify= */ true));
return PackageInfoUtils.generate( return PackageInfoUtils.generate(
pkg, pkg,
null, null,
@@ -709,7 +712,7 @@ public class AppIntegrityManagerServiceImpl extends IAppIntegrityManager.Stub {
// Filter out the rule provider packages that are not system apps. // Filter out the rule provider packages that are not system apps.
List<String> systemAppRuleProviders = new ArrayList<>(); List<String> systemAppRuleProviders = new ArrayList<>();
for (String ruleProvider: integrityRuleProviders) { for (String ruleProvider : integrityRuleProviders) {
if (isSystemApp(ruleProvider)) { if (isSystemApp(ruleProvider)) {
systemAppRuleProviders.add(ruleProvider); systemAppRuleProviders.add(ruleProvider);
} }