| commit | 6c38c03f19a8431dbc952b552dddcc4e35e966ed | [log] [tgz] |
|---|---|---|
| author | David Drysdale <drysdale@google.com> | Thu Jul 13 07:59:09 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 13 07:59:09 2023 +0000 |
| tree | 72bc7327fd9406734c9141d32fabefb78be41a87 | |
| parent | 99e5913e0aec392e3f8d7d588a7f25ac8c402175 [diff] | |
| parent | 4a704165663e772b8e8ac8c6dc36d8d320ef2134 [diff] |
Allow extra ID attestation error codes am: 3f6ab601b9 am: 4a70416566 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2646973 Change-Id: Ifdfb32ac272362704390c750b1fd50c4d99c21d1 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 bdec4d3..1297d1d 100644 --- a/security/keymint/aidl/vts/functional/KeyMintTest.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintTest.cpp
@@ -2086,7 +2086,8 @@ builder, &key_blob, &key_characteristics); } } - ASSERT_EQ(error, ErrorCode::CANNOT_ATTEST_IDS); + + device_id_attestation_check_acceptable_error(tag.tag, error); } }