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

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

Merge "Extend QC SPU waiver to VSR-S devices." am: 32588842 am: f25e3b2b... 

Merge "Extend QC SPU waiver to VSR-S devices." am: 32588842 am: f25e3b2b am: 2415be97 am: 74634c2d

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



Change-Id: I1a0b8761cfcb98ab893e2fa4202f750e74a6736d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6c76cf7c 74634c2d

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

+2 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,8 @@ bool KeyMintAidlTestBase::is_chipset_allowed_km4_strongbox(void) const { 
    auto res = property_get("ro.vendor.qti.soc_model", buffer.data(), nullptr);

    if (res <= 0) return false;



    const string allowed_soc_models[] = {"SM8450", "SM8475", "SM8550", "SXR2230P"};

    const string allowed_soc_models[] = {"SM8450", "SM8475", "SM8550", "SXR2230P",

                                         "SM4450", "SM7450", "SM6450"};



    for (const string model : allowed_soc_models) {

        if (model.compare(buffer.data()) == 0) {