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

Commit dd3b4545 authored by Pranav Garg (xWF)'s avatar Pranav Garg (xWF) Committed by Automerger Merge Worker
Browse files

Fixing isDeviceIdAttestationRequired to require both cases instead of just one... 

Fixing isDeviceIdAttestationRequired to require both cases instead of just one am: e7590725 am: 3eb91702

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3246840



Change-Id: I642c37c3b8f50e6cb7cdf57718431934203cefe5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents adb5ffb5 3eb91702

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__;

}



/**