commit 0838316f47595435d37463341c9925f441991d55
author Song Chun Fan <schfan@google.com> Thu Mar 28 18:08:17 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 28 18:08:17 2024 +0000
tree a5c2ef87595f5a14b5f348d0afc431cf07165ffa
parent d0307c7abb2ec723beab2ba4dbbf260e294bbf45
parent 79dcf12167d73cab6a5fd5aefd3e92d7e198d0b9

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

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

Change-Id: I588e579183f0d367a6f8269e204895d52ffb989f
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 9df93f9..e12becd 100644
--- a/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
+++ b/core/java/com/android/internal/pm/pkg/parsing/ParsingPackageUtils.java
@@ -407,8 +407,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);
         }