| commit | 29005ce693c7e2f0d0cbfe08e9f35da7cbf77e01 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Sep 04 15:05:03 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Sep 04 15:05:03 2024 +0000 |
| tree | a51debcdfc53daa8e4a8cd2d59894c8c382081cb | |
| parent | 85060d8e301a73fdca85b493dc9ba3cd66dc63f7 [diff] | |
| parent | c26d2f72ffd3b8a5698ddb5f25dbfc0e1d078e6f [diff] |
Merge "Check app-attest-key feature supported while using ATTEST_KEY in tests." into main am: c26d2f72ff Original change: https://android-review.googlesource.com/c/platform/system/security/+/3251041 Change-Id: I18cf06f87f11a55dc0308448eb807bafe384034f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/tests/keystore2_client_attest_key_tests.rs b/keystore2/tests/keystore2_client_attest_key_tests.rs index e2eacc4..f723d02 100644 --- a/keystore2/tests/keystore2_client_attest_key_tests.rs +++ b/keystore2/tests/keystore2_client_attest_key_tests.rs
@@ -562,6 +562,8 @@ #[test] fn keystore2_attest_key_fails_with_invalid_attestation_id() { skip_test_if_no_device_id_attestation_feature!(); + skip_device_id_attestation_tests!(); + skip_test_if_no_app_attest_key_feature!(); let sl = SecLevel::tee();