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

Commit cb7045e3 authored by Song Chun Fan's avatar Song Chun Fan Committed by Gerrit Code Review
Browse files

Merge "Avoid collectting certificates repeatedly in method... 

Merge "Avoid collectting certificates repeatedly in method ParsingPackageUtils.parseMonolithicPackage" into main
parents f3ef502a 01294038

core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java

+3 −1
Original line number Diff line number Diff line
@@ -415,8 +415,10 @@ public class ParsingPackageUtils { 
     */

    private ParseResult<ParsingPackage> parseMonolithicPackage(ParseInput input, File apkFile,

            int flags) {

        // The signature parsing will be done later in method parseBaseApk.

        int liteParseFlags = flags & ~PARSE_COLLECT_CERTIFICATES;

        final ParseResult<PackageLite> liteResult =

                ApkLiteParseUtils.parseMonolithicPackageLite(input, apkFile, flags);

                ApkLiteParseUtils.parseMonolithicPackageLite(input, apkFile, liteParseFlags);

        if (liteResult.isError()) {

            return input.error(liteResult);

        }