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

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

Merge "Correct AttestKey test that checks Qualcomm's SPU waiver." am:...

Merge "Correct AttestKey test that checks Qualcomm's SPU waiver." am: 53faa27a am: b0cbb2fa am: 52eb4955 am: 37c45990

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



Change-Id: Ic017730acd0e21e69e5a3f659822a98aac3e6602
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3cf667bc 37c45990
Loading
Loading
Loading
Loading
+5 −2
Original line number Diff line number Diff line
@@ -142,11 +142,14 @@ class AttestKeyTest : public KeyMintAidlTestBase {
        return false;
    }

    // Check if chipset has received a waiver allowing it to be launched with
    // Android S (or later) with Keymaster 4.0 in StrongBox
    // Check if chipset has received a waiver allowing it to be launched with Android S or T with
    // Keymaster 4.0 in StrongBox.
    bool is_chipset_allowed_km4_strongbox(void) const {
        std::array<char, PROPERTY_VALUE_MAX> buffer;

        const int32_t first_api_level = property_get_int32("ro.board.first_api_level", 0);
        if (first_api_level <= 0 || first_api_level > __ANDROID_API_T__) return false;

        auto res = property_get("ro.vendor.qti.soc_model", buffer.data(), nullptr);
        if (res <= 0) return false;