diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2022-05-24 19:01:06 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-24 19:01:06 +0000 |
| commit | cb82bbc3c53d8c0280c6e4e615f79d7c679e177c (patch) | |
| tree | 6c1676b2334a647cc9666bbafbd7ccc4116056de | |
| parent | 60cd6bd863f959dfa86f0a0f838cfec2e1c6989c (diff) | |
| parent | fed9c4818d14f5e1fd33d2bd5907a6ecc498c69b (diff) | |
| download | security-cb82bbc3c53d8c0280c6e4e615f79d7c679e177c.tar.gz | |
Merge "[Compos Telemetry] Fix current_artifacts_ok in the pushed atom" into tm-dev am: 7b28cace73 am: fed9c4818d
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/security/+/18580936
Change-Id: I617d8228fd22b28c4d0d6a5e07e4dfe9eaed7b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | ondevice-signing/odsign_main.cpp | 6 |
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; |