commit 3198b96bd4491b7d37473d2e1ddfa47f3d28d6b2
author Treehugger Robot <treehugger-gerrit@google.com> Wed Feb 16 16:52:42 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Feb 16 16:52:42 2022 +0000
tree 4662caf838270e6471e7a4aada6a11acd139c441
parent 844ec09adab5d44920b123196bc90f64d063c03e
parent 468cc5c3240a2b926dea56c80199cfdbaceb1013

Merge "Keystore 2.0: km_compat: Fix operation slot accounting." am: bc19d0ae3f am: 468cc5c324

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1986712

Change-Id: I6f8f31d5fa9a4aeab4178b4706cc1d3381ee393e

ondevice-signing/odsign_main.cpp

diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index bf79d1a..7d84bac 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -502,7 +502,8 @@
                                                      const SigningKey& signing_key,
                                                      bool* digests_verified) {
     if (!directoryHasContent(kCompOsPendingArtifactsDir)) {
-        return art::odrefresh::ExitCode::kCompilationRequired;
+        // No pending CompOS artifacts, all that matters is the current ones.
+        return checkArtifacts();
     }
 
     // CompOS has generated some artifacts that may, or may not, match the
@@ -653,8 +654,8 @@
     if (useCompOs) {
         auto compos_key = addCompOsCertToFsVerityKeyring(*key);
         if (!compos_key.ok()) {
-            odrefresh_status = art::odrefresh::ExitCode::kCompilationRequired;
             LOG(WARNING) << compos_key.error();
+            odrefresh_status = checkArtifacts();
         } else {
             odrefresh_status =
                 checkCompOsPendingArtifacts(compos_key.value(), *key, &digests_verified);