Merge "VTS: stop network scan once trigger network scan success" into qt-dev (6a660a6d) · Commits · e / os / android_hardware_interfaces

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -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();
		}
		}

		/*

+26 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@
		* limitations under the License.
		*/

		#include <android/hardware/radio/1.1/IRadio.h>
		#include <radio_hidl_hal_utils_v1_2.h>

		void RadioHidlTest_v1_2::SetUp() {
		@@ -85,3 +86,27 @@ void RadioHidlTest_v1_2::updateSimCardStatus() {
		radio_v1_2->getIccCardStatus(serial);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		}

		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());
		}

+4 −1

Original line number	Diff line number	Diff line
		@@ -622,6 +622,9 @@ class RadioHidlTest_v1_2 : public ::testing::VtsHalHidlTargetTestBase {
		/* Update Sim Card Status */
		void updateSimCardStatus();

		/* Stop Network Scan Command */
		void stopNetworkScan();

		public:
		virtual void SetUp() override;