Fix AIDL VTS setup am: eaf2660625 (a6dcde47) · Commits · e / os / android_hardware_interfaces

radio/aidl/vts/AndroidTest.xml

0 → 100644

+34 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="utf-8"?>
			<!-- Copyright (C) 2022 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.
			-->
			<configuration description="Runs VtsHalRadioTargetTest.">
			<option name="test-suite-tag" value="apct" />
			<option name="test-suite-tag" value="apct-native" />

			<target_preparer class="com.android.tradefed.targetprep.MultiSimPreparer" />
			<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
			</target_preparer>

			<target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
			<option name="cleanup" value="true" />
			<option name="push" value="VtsHalRadioTargetTest->/data/local/tmp/VtsHalRadioTargetTest" />
			</target_preparer>

			<test class="com.android.tradefed.testtype.GTest" >
			<option name="native-test-device-path" value="/data/local/tmp" />
			<option name="native-test-timeout" value="300000" /> <!-- 5 min -->
			<option name="module-name" value="VtsHalRadioTargetTest" />
			</test>
			</configuration>
			No newline at end of file

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -107,7 +107,7 @@ bool isVoiceEmergencyOnly(RegState state) {

	bool stringEndsWith(std::string const& string, std::string const& end) {		bool stringEndsWith(std::string const& string, std::string const& end) {
	if (string.size() >= end.size()) {		if (string.size() >= end.size()) {
	return (0 == string.compare(string.size() - end.size() - 1, end.size(), end));		return std::equal(end.rbegin(), end.rend(), string.rbegin());
	} else {		} else {
	return false;		return false;
	}		}
	@@ -116,7 +116,7 @@ bool stringEndsWith(std::string const& string, std::string const& end) {
	bool isServiceValidForDeviceConfiguration(std::string& serviceName) {		bool isServiceValidForDeviceConfiguration(std::string& serviceName) {
	if (isSsSsEnabled()) {		if (isSsSsEnabled()) {
	// Device is configured as SSSS.		// Device is configured as SSSS.
	if (stringEndsWith(serviceName, RADIO_SERVICE_SLOT1_NAME)) {		if (!stringEndsWith(serviceName, RADIO_SERVICE_SLOT1_NAME)) {
	ALOGI("%s instance is not valid for SSSS device.", serviceName.c_str());		ALOGI("%s instance is not valid for SSSS device.", serviceName.c_str());
	return false;		return false;
	}		}

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -24,11 +24,6 @@
	void RadioConfigTest::SetUp() {		void RadioConfigTest::SetUp() {
	std::string serviceName = GetParam();		std::string serviceName = GetParam();

	if (!isServiceValidForDeviceConfiguration(serviceName)) {
	ALOGI("Skipped the test due to device configuration.");
	GTEST_SKIP();
	}

	radio_config = IRadioConfig::fromBinder(		radio_config = IRadioConfig::fromBinder(
	ndk::SpAIBinder(AServiceManager_waitForService(GetParam().c_str())));		ndk::SpAIBinder(AServiceManager_waitForService(GetParam().c_str())));
	ASSERT_NE(nullptr, radio_config.get());		ASSERT_NE(nullptr, radio_config.get());