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