Merge changes from topic "expiration_pruning" am: ca744a7442 am: 90fae733d1
Original change: https://android-review.googlesource.com/c/platform/system/security/+/1987207
Change-Id: I548b787eeff9e640392751d504a199f146be60c3
diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index 99653fa..c6ebfc4 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -376,7 +376,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
@@ -527,8 +528,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);