tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Run SAP tests on slots based on configs" am: ef8b4bee56

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

Change-Id: Iee991178792841a72e3f48e68a1734d3181e8945
This commit is contained in:
Treehugger Robot 2022-02-15 04:48:44 +00:00 committed by Automerger Merge Worker
commit a16e677d82
2 changed files with 39 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
radio/1.0/vts/functional/sap_hidl_hal_test.cpp
View file

@ -16,8 +16,37 @@
#include <sap_hidl_hal_utils.h>
bool isServiceValidForDeviceConfiguration(hidl_string& serviceName) {
if (isSsSsEnabled()) {
// Device is configured as SSSS.
if (serviceName != SAP_SERVICE_SLOT1_NAME) {
LOG(DEBUG) << "Not valid for SSSS device.";
return false;
}
} else if (isDsDsEnabled()) {
// Device is configured as DSDS.
if (serviceName != SAP_SERVICE_SLOT1_NAME && serviceName != SAP_SERVICE_SLOT2_NAME) {
LOG(DEBUG) << "Not valid for DSDS device.";
return false;
}
} else if (isTsTsEnabled()) {
// Device is configured as TSTS.
if (serviceName != SAP_SERVICE_SLOT1_NAME && serviceName != SAP_SERVICE_SLOT2_NAME &&
serviceName != SAP_SERVICE_SLOT3_NAME) {
LOG(DEBUG) << "Not valid for TSTS device.";
return false;
}
}
return true;
}
void SapHidlTest::SetUp() {
sap = ISap::getService(GetParam());
hidl_string serviceName = GetParam();
if (!isServiceValidForDeviceConfiguration(serviceName)) {
LOG(DEBUG) << "Skipped the test due to device configuration.";
GTEST_SKIP();
}
sap = ISap::getService(serviceName);
ASSERT_NE(sap, nullptr);
sapCb = new SapCallback(*this);

10
radio/1.0/vts/functional/sap_hidl_hal_utils.h
View file

@ -36,7 +36,15 @@ using ::android::hardware::Void;
using ::android::sp;
#define TIMEOUT_PERIOD 40
#define SAP_SERVICE_NAME "slot1"
// HAL instance name for SIM slot 1 or single SIM device
#define SAP_SERVICE_SLOT1_NAME "slot1"
// HAL instance name for SIM slot 2 on dual SIM device
#define SAP_SERVICE_SLOT2_NAME "slot2"
// HAL instance name for SIM slot 3 on triple SIM device
#define SAP_SERVICE_SLOT3_NAME "slot3"
class SapHidlTest;