commit 79dcf12167d73cab6a5fd5aefd3e92d7e198d0b9
author Song Chun Fan <schfan@google.com> Thu Mar 28 17:51:25 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 28 17:51:25 2024 +0000
tree 7c71d11a099bd56ae55c1c02a413d3412161ceeb
parent 53e9f441b5bd9d419ddf200046fb7d0c445237ac
parent cb7045e38ba63ac484847e786861a038708aeade

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

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

Change-Id: I4b9293d6569e94318aeeb7213bd6ce51d3ed0436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

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 dbe4fba..9fc7ddb 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 @@
      */
     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);
         }