Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d96e854a authored by Song Pan's avatar Song Pan Committed by Automerger Merge Worker
Browse files

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

Merge "Skip apk verification when collecting certificates." into rvc-dev am: d31dc67d am: bdde3c77 am: 32abc108 am: d232dbdb

Change-Id: Ib6b98b4d23052567b262013a3c0a80cda74c6c89
parents 0dd0e435 d232dbdb

services/core/java/com/android/server/integrity/AppIntegrityManagerServiceImpl.java

+6 −3
Original line number Original line Diff line number Diff line
@@ -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,