| commit | d4f2c051b659f9d151914a4c4b6f2432134b320e | [log] [tgz] |
|---|---|---|
| author | Pranav Garg (xWF) <gargpranav@google.com> | Thu Aug 29 00:04:17 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 29 00:04:17 2024 +0000 |
| tree | 1f50b2af198ddee01cdbba4c2d15427b8ac7948d | |
| parent | 92938c606c5f03553c99e2fed6c8c090e9ea7c2a [diff] | |
| parent | e75907254136f6e8510990d73564fe1bf8d273ca [diff] |
Fixing isDeviceIdAttestationRequired to require both cases instead of just one am: e759072541 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3246840 Change-Id: I53800a3da26821bd1bbc5a610c3cb74719d96fe7 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__; } /**