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

Commit 815f4108 authored by Annie Meng's avatar Annie Meng Committed by android-build-merger
Browse files

Merge "Revert "BluetoothAudio HAL: flip to be enabled by default"" 

am: 3ab5a76d

Change-Id: I84580492f42fc355631cad918f0c6dcc983615cb
parents 96a2f6bc 3ab5a76d

services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Bluetooth Input Audio HAL Audio Policy Configuration file -->

<module name="a2dp" halVersion="2.0">

    <mixPorts>

        <mixPort name="a2dp input" role="sink">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000"

                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

        </mixPort>

    </mixPorts>

    <devicePorts>

        <devicePort tagName="BT A2DP In" type="AUDIO_DEVICE_IN_BLUETOOTH_A2DP" role="source">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000"

                     channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/>

        </devicePort>

    </devicePorts>

    <routes>

        <route type="mix" sink="a2dp input"

               sources="BT A2DP In"/>

    </routes>

</module>

services/audiopolicy/config/audio_policy_configuration.xml

+5 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (C) 2019 The Android Open Source Project

<!-- Copyright (C) 2015 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.
@@ -173,8 +173,8 @@ 


        </module>



        <!-- A2dp Input Audio HAL -->

        <xi:include href="a2dp_in_audio_policy_configuration.xml"/>

        <!-- A2dp Audio HAL -->

        <xi:include href="a2dp_audio_policy_configuration.xml"/>



        <!-- Usb Audio HAL -->

        <xi:include href="usb_audio_policy_configuration.xml"/>
@@ -182,8 +182,8 @@ 
        <!-- Remote Submix Audio HAL -->

        <xi:include href="r_submix_audio_policy_configuration.xml"/>



        <!-- Bluetooth Audio HAL -->

        <xi:include href="bluetooth_audio_policy_configuration.xml"/>

        <!-- Hearing aid Audio HAL -->

        <xi:include href="hearing_aid_audio_policy_configuration.xml"/>



    </modules>

    <!-- End of Modules section -->

services/audiopolicy/config/audio_policy_configuration_bluetooth_legacy_hal.xml

deleted100644 → 0
+0 −198
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<!-- Copyright (C) 2015 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.

-->



<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">

    <!-- version section contains a “version” tag in the form “major.minor” e.g version=”1.0” -->



    <!-- Global configuration Decalaration -->

    <globalConfiguration speaker_drc_enabled="true"/>





    <!-- Modules section:

        There is one section per audio HW module present on the platform.

        Each module section will contains two mandatory tags for audio HAL “halVersion” and “name”.

        The module names are the same as in current .conf file:

                “primary”, “A2DP”, “remote_submix”, “USB”

        Each module will contain the following sections:

        “devicePorts”: a list of device descriptors for all input and output devices accessible via this

        module.

        This contains both permanently attached devices and removable devices.

        “mixPorts”: listing all output and input streams exposed by the audio HAL

        “routes”: list of possible connections between input and output devices or between stream and

        devices.

            "route": is defined by an attribute:

                -"type": <mux|mix> means all sources are mutual exclusive (mux) or can be mixed (mix)

                -"sink": the sink involved in this route

                -"sources": all the sources than can be connected to the sink via vis route

        “attachedDevices”: permanently attached devices.

        The attachedDevices section is a list of devices names. The names correspond to device names

        defined in <devicePorts> section.

        “defaultOutputDevice”: device to be used by default when no policy rule applies

    -->

    <modules>

        <!-- Primary Audio HAL -->

        <module name="primary" halVersion="3.0">

            <attachedDevices>

                <item>Speaker</item>

                <item>Built-In Mic</item>

                <item>Built-In Back Mic</item>

            </attachedDevices>

            <defaultOutputDevice>Speaker</defaultOutputDevice>

            <mixPorts>

                <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="deep_buffer" role="source"

                        flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="compressed_offload" role="source"

                         flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING">

                    <profile name="" format="AUDIO_FORMAT_MP3"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                    <profile name="" format="AUDIO_FORMAT_AAC_LC"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>

                <mixPort name="voice_tx" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </mixPort>

                <mixPort name="primary input" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

                <mixPort name="voice_rx" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </mixPort>

            </mixPorts>

            <devicePorts>

                <!-- Output devices declaration, i.e. Sink DEVICE PORT -->

                <devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">

                   <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                            samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </devicePort>

                <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                    <gains>

                        <gain name="gain_1" mode="AUDIO_GAIN_MODE_JOINT"

                              minValueMB="-8400"

                              maxValueMB="4000"

                              defaultValueMB="0"

                              stepValueMB="100"/>

                    </gains>

                </devicePort>

                <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </devicePort>

                <devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </devicePort>

                <devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </devicePort>

                <devicePort tagName="BT SCO Car Kit" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </devicePort>

                <devicePort tagName="Telephony Tx" type="AUDIO_DEVICE_OUT_TELEPHONY_TX" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>

                </devicePort>



                <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </devicePort>

                <devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </devicePort>

                <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </devicePort>

                <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </devicePort>

                <devicePort tagName="Telephony Rx" type="AUDIO_DEVICE_IN_TELEPHONY_RX" role="source">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,16000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>

                </devicePort>

            </devicePorts>

            <!-- route declaration, i.e. list all available sources for a given sink -->

            <routes>

                <route type="mix" sink="Earpiece"

                       sources="primary output,deep_buffer,BT SCO Headset Mic"/>

                <route type="mix" sink="Speaker"

                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="Wired Headset"

                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="Wired Headphones"

                       sources="primary output,deep_buffer,compressed_offload,BT SCO Headset Mic,Telephony Rx"/>

                <route type="mix" sink="primary input"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic"/>

                <route type="mix" sink="Telephony Tx"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic, voice_tx"/>

                <route type="mix" sink="voice_rx"

                       sources="Telephony Rx"/>

            </routes>



        </module>



        <!-- A2dp Audio HAL -->

        <xi:include href="a2dp_audio_policy_configuration.xml"/>



        <!-- Usb Audio HAL -->

        <xi:include href="usb_audio_policy_configuration.xml"/>



        <!-- Remote Submix Audio HAL -->

        <xi:include href="r_submix_audio_policy_configuration.xml"/>



        <!-- Hearing aid Audio HAL -->

        <xi:include href="hearing_aid_audio_policy_configuration.xml"/>



    </modules>

    <!-- End of Modules section -->



    <!-- Volume section -->



    <xi:include href="audio_policy_volumes.xml"/>

    <xi:include href="default_volume_tables.xml"/>



    <!-- End of Volume section -->



</audioPolicyConfiguration>

services/audiopolicy/config/bluetooth_audio_policy_configuration.xml

deleted100644 → 0
+0 −44
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Bluetooth Audio HAL Audio Policy Configuration file -->

<module name="bluetooth" halVersion="2.0">

    <mixPorts>

        <!-- A2DP Audio Ports -->

        <mixPort name="a2dp output" role="source"/>

        <!-- Hearing AIDs Audio Ports -->

        <mixPort name="hearing aid output" role="source">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="24000,16000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </mixPort>

    </mixPorts>

    <devicePorts>

        <!-- A2DP Audio Ports -->

        <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000,88200,96000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </devicePort>

        <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000,88200,96000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </devicePort>

        <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">

            <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                     samplingRates="44100,48000,88200,96000"

                     channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

        </devicePort>

        <!-- Hearing AIDs Audio Ports -->

        <devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>

    </devicePorts>

    <routes>

        <route type="mix" sink="BT A2DP Out"

               sources="a2dp output"/>

        <route type="mix" sink="BT A2DP Headphones"

               sources="a2dp output"/>

        <route type="mix" sink="BT A2DP Speaker"

               sources="a2dp output"/>

        <route type="mix" sink="BT Hearing Aid Out"

               sources="hearing aid output"/>

    </routes>

</module>

services/audiopolicy/managerdefault/AudioPolicyManager.cpp

+12 −12
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ 
#define AUDIO_POLICY_XML_CONFIG_FILE_NAME "audio_policy_configuration.xml"

#define AUDIO_POLICY_A2DP_OFFLOAD_DISABLED_XML_CONFIG_FILE_NAME \

        "audio_policy_configuration_a2dp_offload_disabled.xml"

#define AUDIO_POLICY_BLUETOOTH_LEGACY_HAL_XML_CONFIG_FILE_NAME \

        "audio_policy_configuration_bluetooth_legacy_hal.xml"

#define AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME \

        "audio_policy_configuration_bluetooth_hal_enabled.xml"



#include <inttypes.h>

#include <math.h>
@@ -3908,17 +3908,17 @@ static status_t deserializeAudioPolicyXmlConfig(AudioPolicyConfig &config) { 
    status_t ret;



    if (property_get_bool("ro.bluetooth.a2dp_offload.supported", false)) {

        if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.disabled", false) &&

            property_get_bool("persist.bluetooth.a2dp_offload.disabled", false)) {

            // Both BluetoothAudio@2.0 and BluetoothA2dp@1.0 (Offlaod) are disabled, and uses

            // the legacy hardware module for A2DP and hearing aid.

            fileNames.push_back(AUDIO_POLICY_BLUETOOTH_LEGACY_HAL_XML_CONFIG_FILE_NAME);

        } else if (property_get_bool("persist.bluetooth.a2dp_offload.disabled", false)) {

            // A2DP offload supported but disabled: try to use special XML file

        if (property_get_bool("persist.bluetooth.a2dp_offload.disabled", false)) {

            fileNames.push_back(AUDIO_POLICY_A2DP_OFFLOAD_DISABLED_XML_CONFIG_FILE_NAME);

        }

    } else if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.disabled", false)) {

        fileNames.push_back(AUDIO_POLICY_BLUETOOTH_LEGACY_HAL_XML_CONFIG_FILE_NAME);

        } else if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.enabled", false)) {

            // This property persist.bluetooth.bluetooth_audio_hal.enabled is temporary only.

            // xml files AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME, although having

            // the same name, must be different in offload and non offload cases in device

            // specific configuration file.

            fileNames.push_back(AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME);

        }

    } else if (property_get_bool("persist.bluetooth.bluetooth_audio_hal.enabled", false)) {

        fileNames.push_back(AUDIO_POLICY_BLUETOOTH_HAL_ENABLED_XML_CONFIG_FILE_NAME);

    }

    fileNames.push_back(AUDIO_POLICY_XML_CONFIG_FILE_NAME);