Merge "Add some delay for SIM power up and down delay for setSimCardPower_1_6 API" am: 5916cc0beb am: 79692ed849 am: 5a725c7f0f am: a85a824d61

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

Change-Id: I0a349dffce796ee47ea68d377e687c910733eca3
This commit is contained in:
Jayachandran Chinnakkannu
2021-11-10 18:15:33 +00:00
committed by Automerger Merge Worker
2 changed files with 7 additions and 0 deletions

View File

@@ -612,6 +612,9 @@ TEST_P(RadioHidlTest_v1_6, setSimCardPower_1_6) {
EXPECT_EQ(0, cardStatus.applications.size());
}
// Give some time for modem to fully power down the SIM card
sleep(MODEM_SET_SIM_POWER_DELAY_IN_SECONDS);
/* Test setSimCardPower power up */
serial = GetRandomSerialNumber();
radio_v1_6->setSimCardPower_1_6(serial, CardPowerState::POWER_UP);
@@ -624,6 +627,9 @@ TEST_P(RadioHidlTest_v1_6, setSimCardPower_1_6) {
::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
::android::hardware::radio::V1_6::RadioError::SIM_ERR}));
// Give some time for modem to fully power up the SIM card
sleep(MODEM_SET_SIM_POWER_DELAY_IN_SECONDS);
// setSimCardPower_1_6 does not return until the request is handled. Just verify that we still
// have CardState::PRESENT after turning the power back on
if (radioRsp_v1_6->rspInfo.error == ::android::hardware::radio::V1_6::RadioError::NONE) {

View File

@@ -47,6 +47,7 @@ using ::android::hardware::Void;
#define MODEM_EMERGENCY_CALL_ESTABLISH_TIME 3
#define MODEM_EMERGENCY_CALL_DISCONNECT_TIME 3
#define MODEM_SET_SIM_POWER_DELAY_IN_SECONDS 2
#define RADIO_SERVICE_SLOT1_NAME "slot1" // HAL instance name for SIM slot 1 or single SIM device
#define RADIO_SERVICE_SLOT2_NAME "slot2" // HAL instance name for SIM slot 2 on dual SIM device