diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-08-29 18:44:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-08-29 18:44:58 +0000 |
| commit | 052f207b42007bb47343ce0c38e3bfb56067a692 (patch) | |
| tree | eb13a44a807d13bdfe3b8091d72afbf2349c560d /radio | |
| parent | e7300721a04b19057cd043205159315616062153 (diff) | |
| parent | f27a92e6347f3b5a2232f7c3be61b8ec67d286b5 (diff) | |
| download | android_hardware_interfaces-052f207b42007bb47343ce0c38e3bfb56067a692.tar.gz android_hardware_interfaces-052f207b42007bb47343ce0c38e3bfb56067a692.tar.bz2 android_hardware_interfaces-052f207b42007bb47343ce0c38e3bfb56067a692.zip | |
Merge "Fix setAllowedCarrier" into pie-vts-dev
Diffstat (limited to 'radio')
| -rw-r--r-- | radio/1.0/vts/functional/radio_hidl_hal_misc.cpp | 50 |
1 files changed, 30 insertions, 20 deletions
diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp index 24d994493..34997625b 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -779,20 +779,27 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } - /* Setting to carrier restriction needs some time */ - updateSimCardStatus(); - auto startTime = std::chrono::system_clock::now(); - while (cardStatus.cardState != CardState::RESTRICTED && - std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - startTime) - .count() < 10) { - /* Set 2 seconds as interval to check card status */ - sleep(2); + if (radioRsp->rspInfo.error == RadioError::NONE) { + /* Setting to carrier restriction needs some time */ updateSimCardStatus(); + auto startTime = std::chrono::system_clock::now(); + while (cardStatus.cardState != CardState::RESTRICTED && + std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - + startTime) + .count() < 10) { + /* Set 2 seconds as interval to check card status */ + sleep(2); + updateSimCardStatus(); + } + EXPECT_EQ(CardState::RESTRICTED, cardStatus.cardState); } - EXPECT_EQ(CardState::RESTRICTED, cardStatus.cardState); sleep(10); - /* Reset back to no carrier restriction */ + /** + * Another test case of the API to cover to allow carrier. + * If the API is supported, this is also used to reset to no carrier restriction + * status for cardStatus. + */ memset(&carriers, 0, sizeof(carriers)); carriers.allowedCarriers.resize(0); carriers.excludedCarriers.resize(0); @@ -808,18 +815,21 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED})); } - /* Resetting back to no carrier restriction needs some time */ - updateSimCardStatus(); - startTime = std::chrono::system_clock::now(); - while (cardStatus.cardState == CardState::RESTRICTED && - std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - startTime) - .count() < 10) { - /* Set 2 seconds as interval to check card status */ - sleep(2); + if (radioRsp->rspInfo.error == RadioError::NONE) { + /* Resetting back to no carrier restriction needs some time */ updateSimCardStatus(); + auto startTime = std::chrono::system_clock::now(); + while (cardStatus.cardState == CardState::RESTRICTED && + std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - + startTime) + .count() < 10) { + /* Set 2 seconds as interval to check card status */ + sleep(2); + updateSimCardStatus(); + } + EXPECT_NE(CardState::RESTRICTED, cardStatus.cardState); + sleep(10); } - EXPECT_NE(CardState::RESTRICTED, cardStatus.cardState); - sleep(10); } /* |