| commit | e0fceb75a047967a32fc63356971685b998b8626 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 25 19:37:13 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 19:37:13 2023 +0000 |
| tree | acf1a0f2efe311237816d1c3c4cfc33c4377f98d | |
| parent | 0e5207054a9d558de79597532e627e1559c0b04a [diff] | |
| parent | f390f754f5a743accc3858e4015a4cebbd30082c [diff] |
Merge "Add an exception for QTI SM8550" into android13-tests-dev am: 2f27d9e80c am: f390f754f5 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2369268 Change-Id: I9490b43f70a8b8d64417d4980e5c237abb01cd74 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp index fb5048a..728cc91 100644 --- a/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp +++ b/keymaster/4.0/vts/functional/keymaster_hidl_hal_test.cpp
@@ -4866,6 +4866,11 @@ if (vsr_api_level < 33) { GTEST_SKIP() << "Applies only to VSR API level 33, this device is: " << vsr_api_level; } + char soc_model[PROPERTY_VALUE_MAX] = {}; + property_get("ro.soc.model", soc_model, ""); + if (!strcmp(soc_model, "SM8550")) { + GTEST_SKIP() << "Skip QTI SM8550 chipset, the SOC model of this device is: " << soc_model; + } FAIL() << "VSR 13+ requires KeyMint version 2"; }