summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2022-05-24 18:21:48 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-05-24 18:21:48 +0000
commit7b28cace73002c7e6f186c2ce308893bfb55035f (patch)
tree6c1676b2334a647cc9666bbafbd7ccc4116056de
parentadf6692b3e024ba997730474b3db0068209a97a4 (diff)
parentf8d1e9b23dfbcfd55cdefdc9c925d496bb376ac9 (diff)
downloadsecurity-7b28cace73002c7e6f186c2ce308893bfb55035f.tar.gz
Merge "[Compos Telemetry] Fix current_artifacts_ok in the pushed atom" into tm-dev
-rw-r--r--ondevice-signing/odsign_main.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/ondevice-signing/odsign_main.cpp b/ondevice-signing/odsign_main.cpp
index 04679a59..c45e3085 100644
--- a/ondevice-signing/odsign_main.cpp
+++ b/ondevice-signing/odsign_main.cpp
@@ -374,7 +374,11 @@ art::odrefresh::ExitCode CheckCompOsPendingArtifacts(const SigningKey& signing_k
if (!directoryHasContent(kCompOsPendingArtifactsDir)) {
// No pending CompOS artifacts, all that matters is the current ones.
- return checkArtifacts();
+ art::odrefresh::ExitCode odrefresh_status = checkArtifacts();
+ if (odrefresh_status == art::odrefresh::ExitCode::kOkay) {
+ compos_check_record->current_artifacts_ok = true;
+ }
+ return odrefresh_status;
}
compos_check_record->comp_os_pending_artifacts_exists = true;