commit 01172a3fa73ed822688d5bdec71ce6fc34b6d9e5
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jul 02 16:45:00 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Jul 02 16:45:00 2024 +0000
tree 3b0155506c30cdca00f52dc2b9d1f8bfc3f13ca9
parent 1f2eabac5e9cff4ead58ebab27f43ad84a767ab4
parent 802eab2d0d2a24b1e5a4632e80070d84053c4746

Merge "Changes to forward the `GET_ATTESTATION_APPLICATION_ID_FAILED` response to Keystore client apps." into main am: 802eab2d0d

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

Change-Id: Iceec620e07250c823d8c18cd84603d72c7bcb453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index 4a8c418..ed7b021 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -451,6 +451,10 @@
                         value: KeyParameterValue::Blob(aaid_ok),
                     });
                 }
+                Err(e) if e == ResponseCode::GET_ATTESTATION_APPLICATION_ID_FAILED.0 as u32 => {
+                    return Err(Error::Rc(ResponseCode::GET_ATTESTATION_APPLICATION_ID_FAILED))
+                        .context(ks_err!("Attestation ID retrieval failed."));
+                }
                 Err(e) => {
                     return Err(anyhow!(e)).context(ks_err!("Attestation ID retrieval error."))
                 }