commit 802eab2d0d2a24b1e5a4632e80070d84053c4746
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Tue Jul 02 16:18:36 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 02 16:18:36 2024 +0000
tree e571f3f12677a1f68162e8cbb758661737ca9576
parent 9c20144be31458ac672d614bb9fec53607abf653
parent c5c691075a6496ef33f2be9925e0780fe7d3694e

Merge "Changes to forward the `GET_ATTESTATION_APPLICATION_ID_FAILED` response to Keystore client apps." into main

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."))
                 }