| commit | da84cc14f901876b4590155193fe7d7316b43e7d | [log] [tgz] |
|---|---|---|
| author | Pranav Garg (xWF) <gargpranav@google.com> | Thu Aug 29 00:31:07 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 29 00:31:07 2024 +0000 |
| tree | f8c69c1849cc90fde76351be335147904f4ffea9 | |
| parent | 21f51188eb7e3529b47e0ed4996faec9e2c1e52f [diff] | |
| parent | 3eb91702f9a23830274516e77c1f858d077adb7a [diff] |
Fixing isDeviceIdAttestationRequired to require both cases instead of just one am: e759072541 am: 3eb91702f9 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3246840 Change-Id: I7dd3020f74bc038a390bfa4faa2b5816ebcb4a04 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 433857c..cafed01 100644 --- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp +++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -199,10 +199,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__; } /**