commit 7407b29a11886d6a2472adacc53860bdab8b7bbf
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Aug 14 17:59:41 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Mon Aug 14 17:59:41 2023 +0000
tree 0d7fda7068d650b5230a4abcbb8f3874fb0cd8f9
parent f68799548c312774240956abb81d02a31b20e985
parent 790f5bf6b3ee5a84dadcb9372be8b219b72f2f65

Merge cherrypicks of ['googleplex-android-review.googlesource.com/23750798'] into tm-platform-release.

Change-Id: I0366d1d912ecc6f9afc919942787d05a85be0a0d

src/main/java/com/android/apksig/ApkVerifier.java

diff --git a/src/main/java/com/android/apksig/ApkVerifier.java b/src/main/java/com/android/apksig/ApkVerifier.java
index 8ae5f78..0b04ef9 100644
--- a/src/main/java/com/android/apksig/ApkVerifier.java
+++ b/src/main/java/com/android/apksig/ApkVerifier.java
@@ -1276,6 +1276,15 @@
         }
 
         private void mergeFrom(ApkSigningBlockUtils.Result source) {
+            if (source == null) {
+                return;
+            }
+            if (source.containsErrors()) {
+                mErrors.addAll(source.getErrors());
+            }
+            if (source.containsWarnings()) {
+                mWarnings.addAll(source.getWarnings());
+            }
             switch (source.signatureSchemeVersion) {
                 case ApkSigningBlockUtils.VERSION_APK_SIGNATURE_SCHEME_V2:
                     mVerifiedUsingV2Scheme = source.verified;