commit f25e3b2bcb1361e546dda7bb0571de27be4e68d0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Thu Jun 01 20:06:15 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 01 20:06:15 2023 +0000
tree a2f65ff9b0fa40bd1ccafebf14c27ed623177939
parent e8821b0fd6c99d29ddc425e3311845b2ccc45612
parent 3258884207822ee18d1638c7a046888f9968c404

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

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

Change-Id: I01243cb987bbc0d93f0a0f9604d3c3e083073c54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

diff --git a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
index e51bb6e..b55e609 100644
--- a/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
+++ b/security/keymint/aidl/vts/functional/KeyMintAidlTestBase.cpp
@@ -1606,7 +1606,8 @@
     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) {