diff --git a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp index 63d3187aed..f11f0d8e9e 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp @@ -60,6 +60,11 @@ TEST_F(RadioHidlTest_v1_2, startNetworkScan) { {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::OPERATION_NOT_ALLOWED})); } + + if (radioRsp_v1_2->rspInfo.error == RadioError::NONE) { + ALOGI("Stop Network Scan"); + stopNetworkScan(); + } } /* diff --git a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp index b34f138bbd..bff7481bed 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_test.cpp +++ b/radio/1.2/vts/functional/radio_hidl_hal_test.cpp @@ -14,6 +14,7 @@ * limitations under the License. */ +#include #include void RadioHidlTest_v1_2::SetUp() { @@ -84,4 +85,28 @@ void RadioHidlTest_v1_2::updateSimCardStatus() { serial = GetRandomSerialNumber(); radio_v1_2->getIccCardStatus(serial); EXPECT_EQ(std::cv_status::no_timeout, wait()); -} \ No newline at end of file +} + +void RadioHidlTest_v1_2::stopNetworkScan() { + sp<::android::hardware::radio::V1_1::IRadio> radio_v1_1; + + radio_v1_1 = ::testing::VtsHalHidlTargetTestBase::getService< + ::android::hardware::radio::V1_1::IRadio>( + RadioHidlEnvironment::Instance() + ->getServiceName<::android::hardware::radio::V1_1::IRadio>( + hidl_string(RADIO_SERVICE_NAME))); + if (radio_v1_1 == NULL) { + sleep(60); + radio_v1_1 = ::testing::VtsHalHidlTargetTestBase::getService< + ::android::hardware::radio::V1_1::IRadio>( + RadioHidlEnvironment::Instance() + ->getServiceName<::android::hardware::radio::V1_1::IRadio>( + hidl_string(RADIO_SERVICE_NAME))); + } + ASSERT_NE(nullptr, radio_v1_1.get()); + + serial = GetRandomSerialNumber(); + + radio_v1_1->stopNetworkScan(serial); + EXPECT_EQ(std::cv_status::no_timeout, wait()); +} diff --git a/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h b/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h index 2e65bfb78f..3f780e555a 100644 --- a/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h +++ b/radio/1.2/vts/functional/radio_hidl_hal_utils_v1_2.h @@ -622,7 +622,10 @@ class RadioHidlTest_v1_2 : public ::testing::VtsHalHidlTargetTestBase { /* Update Sim Card Status */ void updateSimCardStatus(); - public: + /* Stop Network Scan Command */ + void stopNetworkScan(); + + public: virtual void SetUp() override; /* Used as a mechanism to inform the test about data/event callback */