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

Commit 43ccb87f authored by Seth Moore's avatar Seth Moore Committed by Automerger Merge Worker
Browse files

Merge "Relax restrictions on supported API levels" into main am: cdf50ec8 am: 7e15ba96 

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



Change-Id: I043c42ec9b277547495f826bb3269553d740420b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 5610861f 7e15ba96

security/keymint/support/remote_prov_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1005,7 +1005,7 @@ ErrMsgOr<bytevec> parseAndValidateAuthenticatedRequestSignedPayload( 


ErrMsgOr<hwtrust::DiceChain::Kind> getDiceChainKind() {

    int vendor_api_level = ::android::base::GetIntProperty("ro.vendor.api_level", -1);

    if (vendor_api_level == __ANDROID_API_T__) {

    if (vendor_api_level <= __ANDROID_API_T__) {

        return hwtrust::DiceChain::Kind::kVsr13;

    } else if (vendor_api_level == __ANDROID_API_U__) {

        return hwtrust::DiceChain::Kind::kVsr14;