| commit | 31cc9f4d5f18de809ea28491b24412ffa3801178 | [log] [tgz] |
|---|---|---|
| author | Pranav Garg (xWF) <gargpranav@google.com> | Thu Aug 29 01:07:50 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Aug 29 01:07:50 2024 +0000 |
| tree | 98222b2bc37ef66630064b63b728226aee5f5df6 | |
| parent | c9fb8e8f147681bef90e85aa92efd44d548880ca [diff] | |
| parent | da84cc14f901876b4590155193fe7d7316b43e7d [diff] |
Fixing isDeviceIdAttestationRequired to require both cases instead of just one am: e759072541 am: 3eb91702f9 am: da84cc14f9 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3246840 Change-Id: Ib1689d11024413e94b27c7ed59f90c8649dd98dd 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__; } /**