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

Commit 9648fd64 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixing isDeviceIdAttestationRequired to require both cases instead of... 

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

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



Change-Id: I47aa9b20e06a0eceb9951719d04b1edaecc2f66f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5b58be09 dd98cc11

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

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

}



/**