summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-11 21:06:15 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2021-11-11 21:06:15 +0000
commit7ba4a8f2637da48c67e923e710a643b0b3800e65 (patch)
tree0569f66b49289bbff7e977da2dc9155bff9bebf5
parent0b91da98743bf1c64ab6b40013023f6f96526734 (diff)
parentf59f4c6dcf39e76f9508874a6f21296f4f1f4e4d (diff)
downloadinterfaces-7ba4a8f2637da48c67e923e710a643b0b3800e65.tar.gz
Snap for 7906468 from f59f4c6dcf39e76f9508874a6f21296f4f1f4e4d to android12-tests-releaseandroid-cts-12.0_r2
Change-Id: Id92c08c9783967833a6904a2ab18e3c8bb88558d
-rw-r--r--radio/1.6/vts/functional/radio_hidl_hal_api.cpp6
-rw-r--r--radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
index cdfcc94cb8..f513aa1e0d 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
@@ -601,6 +601,9 @@ TEST_P(RadioHidlTest_v1_6, setSimCardPower_1_6) {
::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,
::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE}));
+ // Give some time for modem to fully power down the SIM card
+ sleep(MODEM_SET_SIM_POWER_DELAY_IN_SECONDS);
+
// setSimCardPower_1_6 does not return until the request is handled, and should not trigger
// CardState::ABSENT when turning off power
if (radioRsp_v1_6->rspInfo.error == ::android::hardware::radio::V1_6::RadioError::NONE) {
@@ -624,6 +627,9 @@ TEST_P(RadioHidlTest_v1_6, setSimCardPower_1_6) {
::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,
::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE}));
+ // 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) {
diff --git a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
index 54c297719f..f0418652fd 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
+++ b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
@@ -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