Fixing isDeviceIdAttestationRequired to require both cases instead of just one

Bug: 356536705

Change-Id: I15326e68fc2ea1ce9a2dfbe7498790900ebb43e4
(cherry picked from commit f74d274807)
This commit is contained in:
Pranav Garg (xWF)
2024-08-26 20:15:23 +00:00
committed by Pranav Garg (xWF)
parent 3d9d5d8530
commit e759072541

View File

@@ -199,10 +199,10 @@ uint32_t KeyMintAidlTestBase::boot_patch_level() {
/**
* 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__;
}
/**