| commit | 9648fd64d8db2fe9a08f07b1a1e1724d2b3a54c1 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Tue Aug 27 22:14:13 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Aug 27 22:14:13 2024 +0000 |
| tree | 8119fa0773a8172a554d00c7611f027d2e953def | |
| parent | 5b58be09bc5659264063b986ced6bc68619b0a04 [diff] | |
| parent | dd98cc118951c8084192a36d48fcdf26985ef0ee [diff] |
Merge "Fixing isDeviceIdAttestationRequired to require both cases instead of just one" into main am: dd98cc1189 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3243582 Change-Id: I47aa9b20e06a0eceb9951719d04b1edaecc2f66f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp index 2ba75a3..c19ab11 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -236,10 +236,10 @@ /** * An API to determine device IDs attestation is required or not, - * which is mandatory for KeyMint version 2 or first_api_level 33 or greater. + * which is mandatory for KeyMint version 2 and first_api_level 33 or greater. */ bool KeyMintAidlTestBase::isDeviceIdAttestationRequired() { - return AidlVersion() >= 2 || property_get_int32("ro.vendor.api_level", 0) >= __ANDROID_API_T__; + return AidlVersion() >= 2 && property_get_int32("ro.vendor.api_level", 0) >= __ANDROID_API_T__; } /**