diff options
author | Song Chun Fan <schfan@google.com> | 2024-03-28 17:34:14 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-28 17:34:14 +0000 |
commit | cb7045e38ba63ac484847e786861a038708aeade (patch) | |
tree | 7c71d11a099bd56ae55c1c02a413d3412161ceeb | |
parent | f3ef502ad61c9ba576f8dadc2665b98f4f9a79bb (diff) | |
parent | 01294038ddbf3b54f9c1e1e9b634bd2680a2b023 (diff) | |
download | base-cb7045e38ba63ac484847e786861a038708aeade.tar.gz |
Merge "Avoid collectting certificates repeatedly in method ParsingPackageUtils.parseMonolithicPackage" into main
-rw-r--r-- | core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java index dbe4fba5dfdb..9fc7ddb57847 100644 --- a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java +++ b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java @@ -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); } |