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

Commit 6fcbfed6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Bluetooth: Turn Bluetooth off while device setup" am: 24c422c4 am:... 

Merge "Bluetooth: Turn Bluetooth off while device setup" am: 24c422c4 am: dac4637f am: c1953977 am: ef1f8bb2

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

Change-Id: I8dd9c3507fda3a465a6db43059ca5617e402c55c
parents 0c806afa ef1f8bb2

bluetooth/1.0/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ cc_test { 
        "android.hardware.bluetooth@1.0",

        "libbluetooth-types",

    ],

    test_config: "VtsHalBluetoothV1_0TargetTest.xml",

    test_suites: [

        "general-tests",

        "vts",

bluetooth/1.0/vts/functional/VtsHalBluetoothV1_0TargetTest.xml

0 → 100644
+38 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->

<configuration description="Runs VtsHalBluetoothV1_0TargetTest.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-native" />



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

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.StopServicesSetup">

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">

        <option name="bluetooth" value="off" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="VtsHalBluetoothV1_0TargetTest->/data/local/tmp/VtsHalBluetoothV1_0TargetTest" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="VtsHalBluetoothV1_0TargetTest" />

    </test>

</configuration>

bluetooth/1.1/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ cc_test { 
        "android.hardware.bluetooth@1.0",

        "libbluetooth-types",

    ],

    test_config: "VtsHalBluetoothV1_1TargetTest.xml",

    test_suites: ["general-tests", "vts"],

}

bluetooth/1.1/vts/functional/VtsHalBluetoothV1_1TargetTest.xml

0 → 100644
+36 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->

<configuration description="Runs VtsHalBluetoothV1_1TargetTest.">

    <option name="test-suite-tag" value="apct" />

    <option name="test-suite-tag" value="apct-native" />



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

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">

        <option name="bluetooth" value="off" />

    </target_preparer>



    <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">

        <option name="cleanup" value="true" />

        <option name="push" value="VtsHalBluetoothV1_1TargetTest->/data/local/tmp/VtsHalBluetoothV1_1TargetTest" />

    </target_preparer>



    <test class="com.android.tradefed.testtype.GTest" >

        <option name="native-test-device-path" value="/data/local/tmp" />

        <option name="module-name" value="VtsHalBluetoothV1_1TargetTest" />

    </test>

</configuration>