| commit | 8d95eb97d4d955f12b00da48d67cce204daf5ba0 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Jan 17 23:02:28 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jan 17 23:02:28 2023 +0000 |
| tree | 631f27077c5e558416bff7597777c191bc3b4df5 | |
| parent | 9aa84ddadd8b3a6500f02f64249e162bfccebcee [diff] | |
| parent | 26ceba03bc8416458ea7aa64f4106dc6ef23c5ca [diff] |
Merge "Add an exception for QTI SM8550" am: 26ceba03bc Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2369228 Change-Id: Id7519e851063bf0b9911616851a32474900bc3d9 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"; }