Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7590725 authored by Pranav Garg (xWF)'s avatar Pranav Garg (xWF) Committed by Pranav Garg (xWF)
Browse files

Fixing isDeviceIdAttestationRequired to require both cases instead of just one 

Bug: 356536705

Change-Id: I15326e68fc2ea1ce9a2dfbe7498790900ebb43e4
(cherry picked from commit f74d2748)
parent 3d9d5d85

security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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__;

}



/**