Merge "radio: Add VTS test for OperatorInfo.operatorNumeric" (91ce32ad) · Commits · e / os / android_hardware_interfaces

radio/1.6/vts/functional/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ cc_test {
		defaults: ["VtsHalTargetTestDefaults"],
		srcs: [
		"radio_hidl_hal_api.cpp",
		"radio_hidl_hal_misc.cpp",
		"radio_hidl_hal_test.cpp",
		"radio_response.cpp",
		"radio_indication.cpp",

radio/1.6/vts/functional/radio_hidl_hal_misc.cpp

0 → 100644

+56 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <regex>

		#include <android-base/logging.h>
		#include <radio_hidl_hal_utils_v1_6.h>

		/*
		* Test IRadio.getAvailableNetworks() for the response returned.
		*/
		TEST_P(RadioHidlTest_v1_6, getAvailableNetworks) {
		LOG(DEBUG) << "getAvailableNetworks";
		serial = GetRandomSerialNumber();

		radio_v1_6->getAvailableNetworks(serial);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo_v1_0.serial);
		ASSERT_TRUE(radioRsp_v1_6->rspInfo_v1_0.type == RadioResponseType::SOLICITED \|\|
		radioRsp_v1_6->rspInfo_v1_0.type == RadioResponseType::SOLICITED_ACK_EXP);

		if (cardStatus.base.base.base.cardState == CardState::ABSENT) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo_v1_0.error,
		{::android::hardware::radio::V1_0::RadioError::NONE,
		::android::hardware::radio::V1_0::RadioError::CANCELLED,
		::android::hardware::radio::V1_0::RadioError::DEVICE_IN_USE,
		::android::hardware::radio::V1_0::RadioError::MODEM_ERR,
		::android::hardware::radio::V1_0::RadioError::OPERATION_NOT_ALLOWED},
		CHECK_GENERAL_ERROR));
		} else if (radioRsp_v1_6->rspInfo_v1_0.error ==
		::android::hardware::radio::V1_0::RadioError::NONE) {
		static const std::regex kOperatorNumericRe("^[0-9]{5,6}$");
		for (OperatorInfo info : radioRsp_v1_6->networkInfos) {
		if (info.operatorNumeric != nullptr) {
		ASSERT_TRUE(
		std::regex_match(std::string(info.operatorNumeric), kOperatorNumericRe));
		}
		}
		}

		LOG(DEBUG) << "getAvailableNetworks finished";
		}

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -60,6 +60,7 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon

		public:
		hidl_vec<RadioBandMode> radioBandModes;
		hidl_vec<OperatorInfo> networkInfos;

		::android::hardware::radio::V1_0::RadioResponseInfo rspInfo_v1_0;
		::android::hardware::radio::V1_6::RadioResponseInfo rspInfo;

radio/1.6/vts/functional/radio_response.cpp

+5 −2

Original line number	Diff line number	Diff line
		@@ -274,8 +274,11 @@ Return<void> RadioResponse_v1_6::setNetworkSelectionModeManualResponse(
		}

		Return<void> RadioResponse_v1_6::getAvailableNetworksResponse(
		const ::android::hardware::radio::V1_0::RadioResponseInfo& /info/,
		const ::android::hardware::hidl_vec<OperatorInfo>& /networkInfos/) {
		const ::android::hardware::radio::V1_0::RadioResponseInfo& info,
		const ::android::hardware::hidl_vec<OperatorInfo>& networkInfos) {
		rspInfo_v1_0 = info;
		this->networkInfos = networkInfos;
		parent_v1_6.notify(info.serial);
		return Void();
		}