From 6fb73ec89149c4de3a40c9289d17334bf93f5017 Mon Sep 17 00:00:00 2001 From: sqian Date: Tue, 14 Aug 2018 12:30:57 -0700 Subject: [PATCH] Patch for setSimCardPower_1_1 Do not expect its affect on cardStatus if it is not successfully returned. Check the response error before updating sim card status. Test: sanity Bug: 111661946 Change-Id: I48551f5469289b9fcfc47dd9fd2e455779640329 --- .../1.1/vts/functional/radio_hidl_hal_api.cpp | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 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 40759a6efd..33347c5d7a 100644 --- a/radio/1.1/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.1/vts/functional/radio_hidl_hal_api.cpp @@ -33,17 +33,17 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) { ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_1->rspInfo.error, {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE})); - /* Wait some time for setting sim power down and then verify it */ - updateSimCardStatus(); - auto startTime = std::chrono::system_clock::now(); - while (cardStatus.cardState != CardState::ABSENT && + if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) { + /* Wait some time for setting sim power down and then verify it */ + updateSimCardStatus(); + auto startTime = std::chrono::system_clock::now(); + while (cardStatus.cardState != CardState::ABSENT && std::chrono::duration_cast(std::chrono::system_clock::now() - startTime) .count() < 80) { - /* Set 2 seconds as interval to check card status */ - sleep(2); - updateSimCardStatus(); - } - if (radioRsp_v1_1->rspInfo.error == RadioError::NONE) { + /* Set 2 seconds as interval to check card status */ + sleep(2); + updateSimCardStatus(); + } EXPECT_EQ(CardState::ABSENT, cardStatus.cardState); } @@ -65,7 +65,7 @@ TEST_F(RadioHidlTest_v1_1, setSimCardPower_1_1) { 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(); + auto startTime = std::chrono::system_clock::now(); while (cardStatus.cardState != CardState::PRESENT && std::chrono::duration_cast(std::chrono::system_clock::now() - startTime)