Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AIDL VTS setup am: eaf2660625

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2032528

Change-Id: Ic05cf2551212388a6f572874627cfc6695175393
This commit is contained in:
Sarah Chin
2022-03-21 16:26:20 +00:00
committed by Automerger Merge Worker
parent a1ae953b4e eaf2660625
commit a6dcde47d3
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
radio/aidl/vts/AndroidTest.xml Normal file
View File

@@ -0,0 +1,34 @@
<?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>

4
radio/aidl/vts/radio_aidl_hal_utils.cpp
View File

@@ -107,7 +107,7 @@ bool isVoiceEmergencyOnly(RegState state) {
bool stringEndsWith(std::string const& string, std::string const& end) {
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 {
return false;
}
@@ -116,7 +116,7 @@ bool stringEndsWith(std::string const& string, std::string const& end) {
bool isServiceValidForDeviceConfiguration(std::string& serviceName) {
if (isSsSsEnabled()) {
// 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());
return false;
}

5
radio/aidl/vts/radio_config_test.cpp
View File

@@ -24,11 +24,6 @@
void RadioConfigTest::SetUp() {
std::string serviceName = GetParam();
if (!isServiceValidForDeviceConfiguration(serviceName)) {
ALOGI("Skipped the test due to device configuration.");
GTEST_SKIP();
}
radio_config = IRadioConfig::fromBinder(
ndk::SpAIBinder(AServiceManager_waitForService(GetParam().c_str())));
ASSERT_NE(nullptr, radio_config.get());