| commit | 3eb91702f9a23830274516e77c1f858d077adb7a | [log] [tgz] |
|---|---|---|
| author | Pranav Garg (xWF) <gargpranav@google.com> | Thu Aug 29 00:04:56 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 29 00:04:56 2024 +0000 |
| tree | 4a8d496d5c354a1d20163c6f75b1df1d0e86bd30 | |
| parent | ae3c6f852f7a9bc2babcc365c981456447be2cbf [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: I2c8f51eb5bda72cea0d22ced6065fdc265a329c8 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__; } /**