summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2018-08-14 20:13:47 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-08-14 20:13:47 +0000
commitc1db4227234aa3c85ef59e03df360bb54f0d0bcf (patch)
treece478170ae6987891bea8d4e73d261364cfc1c73
parenta935e652afdf60e79964b8eb550e5542e19efddd (diff)
parentf25e9963023cfec18e2047a0541043b6f998f986 (diff)
downloadandroid_hardware_interfaces-c1db4227234aa3c85ef59e03df360bb54f0d0bcf.tar.gz
android_hardware_interfaces-c1db4227234aa3c85ef59e03df360bb54f0d0bcf.tar.bz2
android_hardware_interfaces-c1db4227234aa3c85ef59e03df360bb54f0d0bcf.zip
Merge "Fix setSimCardPower_1_1" into pie-vts-dev
-rw-r--r--radio/1.1/vts/functional/radio_hidl_hal_api.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
index 90077dcf6..40759a6ef 100644
--- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp
@@ -43,7 +43,9 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) {
sleep(2);
updateSimCardStatus();
}
- EXPECT_EQ(CardState::ABSENT, cardStatus.cardState);
+ if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) {
+ EXPECT_EQ(CardState::ABSENT, cardStatus.cardState);
+ }
/* Test setSimCardPower power up */
serial = GetRandomSerialNumber();
@@ -59,7 +61,8 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) {
* If the sim card status for the testing environment is PRESENT,
* verify if sim status is reset back.
*/
- if (cardStateForTest == CardState::PRESENT) {
+ if (cardStateForTest == CardState::PRESENT &&
+ radioRsp_v1_1->rspInfo.error == RadioError::NONE) {
/* Wait some time for resetting back to sim power on and then verify it */
updateSimCardStatus();
startTime = std::chrono::system_clock::now();