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

Commit 79dcf121 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

Merge "Avoid collectting certificates repeatedly in method... 

Merge "Avoid collectting certificates repeatedly in method ParsingPackageUtils.parseMonolithicPackage" into main am: cb7045e3

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3008137



Change-Id: I4b9293d6569e94318aeeb7213bd6ce51d3ed0436
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 53e9f441 cb7045e3

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);

        }