| commit | e4cc51fe8735ebaa9dabfc1e55eb3a8911ab41f0 | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jul 13 07:58:38 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 13 07:58:38 2023 +0000 |
| tree | a7c3b960d5b5fa9a9683695a743918978183ee29 | |
| parent | 060cb55a5252b0a9116dbce8cce60e9e0dd991d3 [diff] | |
| parent | b37f07acc28588c4d40a864efcab48832fd1969a [diff] |
Allow extra ID attestation error codes am: 3f6ab601b9 am: b37f07acc2 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973 Change-Id: I9a2c1cb8d89525dfce2d9ca55e7bf51bc0ce6cc0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/KeyMintTest.cpp b/security/keymint/aidl/vts/functional/KeyMintTest.cpp index 4e746b2..18d49e9 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -1938,7 +1938,8 @@ builder, &key_blob, &key_characteristics); } } - ASSERT_EQ(error, ErrorCode::CANNOT_ATTEST_IDS); + + device_id_attestation_check_acceptable_error(tag.tag, error); } }