Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea2864db authored by Sarah Chin's avatar Sarah Chin Committed by Android (Google) Code Review
Browse files

Merge "Fix AIDL VTS setup" into tm-dev

parents 6564ff8b 5da33a22

radio/aidl/vts/AndroidTest.xml

0 → 100644
+34 −0
Original line number 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

radio/aidl/vts/radio_aidl_hal_utils.cpp

+2 −2
Original line number Diff line number Diff line
@@ -108,7 +108,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;

    }
@@ -117,7 +117,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;

        }

radio/aidl/vts/radio_config_test.cpp

+0 −5
Original line number Diff line number Diff line
@@ -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());