Merge "Add VTS for measurement type UTRAN ECNO" (0bc36943) · Commits · e / os / android_hardware_interfaces

radio/aidl/compat/libradiocompat/include/libradiocompat/RadioNetwork.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@
		#include "RadioCompatBase.h"

		#include <aidl/android/hardware/radio/network/BnRadioNetwork.h>
		#include <aidl/android/hardware/radio/network/IRadioNetwork.h>

		// using namespace aidl::android::hardware::radio::network;

		namespace android::hardware::radio::compat {

radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -261,6 +261,11 @@ ScopedAStatus RadioNetwork::setSignalStrengthReportingCriteria(
		if (infos.size() > 1) {
		LOG(WARNING) << "Multi-element reporting criteria are not supported with HIDL HAL";
		}
		if (infos[0].signalMeasurement == aidl::SignalThresholdInfo::SIGNAL_MEASUREMENT_TYPE_ECNO) {
		LOG(WARNING) << "SIGNAL_MEASUREMENT_TYPE_ECNO are not supported with HIDL HAL";
		respond()->setSignalStrengthReportingCriteriaResponse(notSupported(serial));
		return ok();
		}
		mHal1_5->setSignalStrengthReportingCriteria_1_5(serial, toHidl(infos[0]),
		V1_5::AccessNetwork(infos[0].ran));
		return ok();

radio/aidl/vts/radio_network_test.cpp

+28 −1

Original line number	Diff line number	Diff line
		@@ -356,7 +356,7 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Geran) {
		/*
		* Test IRadioNetwork.setSignalStrengthReportingCriteria() for UTRAN
		*/
		TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Utran) {
		TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Utran_Rscp) {
		serial = GetRandomSerialNumber();

		SignalThresholdInfo signalThresholdInfo;
		@@ -379,6 +379,33 @@ TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Utran) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::NONE}));
		}

		/*
		* Test IRadioNetwork.setSignalStrengthReportingCriteria() for UTRAN
		*/
		TEST_P(RadioNetworkTest, setSignalStrengthReportingCriteria_Utran_Ecno) {
		serial = GetRandomSerialNumber();

		SignalThresholdInfo signalThresholdInfo;
		signalThresholdInfo.signalMeasurement = SignalThresholdInfo::SIGNAL_MEASUREMENT_TYPE_ECNO;
		signalThresholdInfo.hysteresisMs = 5000;
		signalThresholdInfo.hysteresisDb = 2;
		signalThresholdInfo.thresholds = {-22, -18, 0};
		signalThresholdInfo.isEnabled = true;
		signalThresholdInfo.ran = AccessNetwork::UTRAN;

		ndk::ScopedAStatus res =
		radio_network->setSignalStrengthReportingCriteria(serial, {signalThresholdInfo});
		ASSERT_OK(res);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);

		ALOGI("setSignalStrengthReportingCriteria_Utran, rspInfo.error = %s\n",
		toString(radioRsp_network->rspInfo.error).c_str());
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
		}

		/*
		* Test IRadioNetwork.setSignalStrengthReportingCriteria() for EUTRAN
		*/