| commit | 15f7ce84f0d71418c6559b352f2f54f41267adcb | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Wed Jan 25 20:42:39 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 25 20:42:39 2023 +0000 |
| tree | 494838b0ee99e55df7234212047da7850f71a302 | |
| parent | 80205488c43e45aa0efbebae5a083807ed1d2299 [diff] | |
| parent | 6b720abf72eab74a463da8be39ac6d0182fe6666 [diff] |
Merge "Add an exception for QTI SM8550" into android13-tests-dev am: 2f27d9e80c am: f390f754f5 am: 6b720abf72 Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2369268 Change-Id: Id688a2e877490b8caaee6a810e24dafa2e24232c 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"; }