Merge "Fixing isDeviceIdAttestationRequired to require both cases instead of just one" into main

This commit is contained in:
Treehugger Robot
2024-08-27 22:11:59 +00:00
committed by Gerrit Code Review

View File

@@ -236,10 +236,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__;
}
/**