diff options
| -rw-r--r-- | BoardConfigCommon.mk | 1 | ||||
| -rw-r--r-- | audio/audio_policy_configuration.xml | 24 | ||||
| -rw-r--r-- | audio/audio_policy_configuration_a2dp_offload_disabled.xml | 369 | ||||
| -rw-r--r-- | audio/audio_policy_configuration_a2dp_offload_disabled_qti.xml | 369 | ||||
| -rw-r--r-- | audio/bluetooth_qti_audio_policy_configuration.xml | 44 | ||||
| -rw-r--r-- | bluetooth/bdroid_buildcfg.h | 10 | ||||
| -rw-r--r-- | configs/component-overrides-qti.xml | 21 | ||||
| -rw-r--r-- | configs/component-overrides.xml | 1 | ||||
| -rw-r--r-- | properties.mk | 10 | ||||
| -rw-r--r-- | proprietary-files.txt | 12 | ||||
| -rw-r--r-- | sdm660.mk | 13 |
11 files changed, 15 insertions, 859 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 4d29c3a..2061f30 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -81,7 +81,6 @@ AUDIO_FEATURE_ENABLED_EXT_AMPLIFIER := false # Bluetooth BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth -TARGET_FWK_SUPPORTS_FULL_VALUEADDS := true # Camera TARGET_USES_QTI_CAMERA_DEVICE := true diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index a1fd6ed..544e2f7 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -238,21 +238,6 @@ <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/> </devicePort> - <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" - encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink" - encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink" - encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_LDAC AUDIO_FORMAT_CELT AUDIO_FORMAT_APTX_ADAPTIVE"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> @@ -337,12 +322,6 @@ sources="Built-In Mic,Built-In Back Mic"/> <route type="mix" sink="record_24" sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/> - <route type="mix" sink="BT A2DP Out" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> - <route type="mix" sink="BT A2DP Headphones" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> - <route type="mix" sink="BT A2DP Speaker" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> </routes> @@ -374,6 +353,9 @@ <!-- Remote Submix Audio HAL --> <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/> + <!-- Bluetooth Audio HAL --> + <xi:include href="/vendor/etc/bluetooth_audio_policy_configuration.xml"/> + </modules> <!-- End of Modules section --> diff --git a/audio/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/audio_policy_configuration_a2dp_offload_disabled.xml deleted file mode 100644 index 544e2f7..0000000 --- a/audio/audio_policy_configuration_a2dp_offload_disabled.xml +++ /dev/null @@ -1,369 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- Copyright (c) 2016-2019, The Linux Foundation. All rights reserved - Not a Contribution. ---> -<!-- 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="2.0"> - <attachedDevices> - <item>Earpiece</item> - <item>Speaker</item> - <item>Telephony Tx</item> - <item>Built-In Mic</item> - <item>Built-In Back Mic</item> - <item>FM Tuner</item> - <item>Telephony Rx</item> - </attachedDevices> - <defaultOutputDevice>Speaker</defaultOutputDevice> - <mixPorts> - <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - <mixPort name="raw" role="source" - flags="AUDIO_OUTPUT_FLAG_FAST"> - <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="hifi_playback" role="source" /> - <mixPort name="compress_passthrough" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="dynamic" - samplingRates="dynamic" channelMasks="dynamic"/> - </mixPort> - <mixPort name="direct_pcm" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - </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_FLAC" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_ALAC" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_APE" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - 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,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V1" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V2" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_DTS" - samplingRates="32000,44100,48000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/> - <profile name="" format="AUDIO_FORMAT_DTS_HD" - samplingRates="32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_WMA" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_WMA_PRO" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V1" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V2" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - </mixPort> - <mixPort name="dsd_compress_passthrough" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="AUDIO_FORMAT_DSD" - samplingRates="2822400,5644800" - 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,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - <mixPort name="voip_rx" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,16000,32000,48000" 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="voip_tx" role="sink" - flags="AUDIO_INPUT_FLAG_VOIP_TX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> - </mixPort> - <mixPort name="surround_sound" 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,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/> - </mixPort> - <mixPort name="record_24" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/> - <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/> - </mixPort> - <mixPort name="voice_rx" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </mixPort> - <mixPort name="hifi_input" role="sink" /> - </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"/> - </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="Line" type="AUDIO_DEVICE_OUT_LINE" 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,AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - - <!-- Input devices declaration, i.e. Source DEVICE PORT --> - <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="FM Tuner" type="AUDIO_DEVICE_IN_FM_TUNER" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </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,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> - </devicePort> - <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"> - </devicePort> - <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source"> - </devicePort> - - </devicePorts> - <!-- route declaration, i.e. list all available sources for a given sink --> - <routes> - <route type="mix" sink="Earpiece" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="Speaker" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="Wired Headset" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> - <route type="mix" sink="Wired Headphones" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> - <route type="mix" sink="Line" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> - <route type="mix" sink="HDMI" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough"/> - <route type="mix" sink="Proxy" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> - <route type="mix" sink="FM" - sources="primary output"/> - <route type="mix" sink="BT SCO" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="BT SCO Headset" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="BT SCO Car Kit" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="USB Device Out" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback"/> - <route type="mix" sink="USB Headset Out" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback"/> - <route type="mix" sink="Telephony Tx" - sources="voice_tx"/> - <route type="mix" sink="voice_rx" - sources="Telephony Rx"/> - <route type="mix" sink="primary input" - sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/> - <route type="mix" sink="voip_tx" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> - <route type="mix" sink="surround_sound" - sources="Built-In Mic,Built-In Back Mic"/> - <route type="mix" sink="record_24" - sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/> - <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> - </routes> - - </module> - - <!-- A2DP Input Audio HAL --> - <xi:include href="/vendor/etc/a2dp_in_audio_policy_configuration.xml"/> - - <!-- Usb Audio HAL --> - <module name="usb" halVersion="2.0"> - <mixPorts> - <mixPort name="usb_accessory output" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - </mixPorts> - <devicePorts> - <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - </devicePorts> - <routes> - <route type="mix" sink="USB Host Out" - sources="usb_accessory output"/> - </routes> - </module> - - <!-- Remote Submix Audio HAL --> - <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/> - - <!-- Bluetooth Audio HAL --> - <xi:include href="/vendor/etc/bluetooth_audio_policy_configuration.xml"/> - - </modules> - <!-- End of Modules section --> - - <!-- Volume section --> - - <xi:include href="/vendor/etc/audio_policy_volumes.xml"/> - <xi:include href="/vendor/etc/default_volume_tables.xml"/> - - <!-- End of Volume section --> - -</audioPolicyConfiguration> diff --git a/audio/audio_policy_configuration_a2dp_offload_disabled_qti.xml b/audio/audio_policy_configuration_a2dp_offload_disabled_qti.xml deleted file mode 100644 index f8eabbd..0000000 --- a/audio/audio_policy_configuration_a2dp_offload_disabled_qti.xml +++ /dev/null @@ -1,369 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- Copyright (c) 2016-2019, The Linux Foundation. All rights reserved - Not a Contribution. ---> -<!-- 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="2.0"> - <attachedDevices> - <item>Earpiece</item> - <item>Speaker</item> - <item>Telephony Tx</item> - <item>Built-In Mic</item> - <item>Built-In Back Mic</item> - <item>FM Tuner</item> - <item>Telephony Rx</item> - </attachedDevices> - <defaultOutputDevice>Speaker</defaultOutputDevice> - <mixPorts> - <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST|AUDIO_OUTPUT_FLAG_PRIMARY"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - <mixPort name="raw" role="source" - flags="AUDIO_OUTPUT_FLAG_FAST"> - <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="hifi_playback" role="source" /> - <mixPort name="compress_passthrough" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="dynamic" - samplingRates="dynamic" channelMasks="dynamic"/> - </mixPort> - <mixPort name="direct_pcm" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_PCM_32_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000,352800,384000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - </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_FLAC" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_ALAC" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_APE" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000,128000,176400,192000" - 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,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V1" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_HE_V2" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_DTS" - samplingRates="32000,44100,48000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1"/> - <profile name="" format="AUDIO_FORMAT_DTS_HD" - samplingRates="32000,44100,48000,64000,88200,96000,128000,176400,192000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_WMA" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_WMA_PRO" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_2POINT1,AUDIO_CHANNEL_OUT_QUAD,AUDIO_CHANNEL_OUT_PENTA,AUDIO_CHANNEL_OUT_5POINT1,AUDIO_CHANNEL_OUT_6POINT1,AUDIO_CHANNEL_OUT_7POINT1"/> - <profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V1" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - <profile name="" format="AUDIO_FORMAT_AAC_ADTS_HE_V2" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000" - channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/> - </mixPort> - <mixPort name="dsd_compress_passthrough" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_NON_BLOCKING"> - <profile name="" format="AUDIO_FORMAT_DSD" - samplingRates="2822400,5644800" - 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,48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - <mixPort name="voip_rx" role="source" - flags="AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_VOIP_RX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,16000,32000,48000" 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="voip_tx" role="sink" - flags="AUDIO_INPUT_FLAG_VOIP_TX"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,16000,32000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> - </mixPort> - <mixPort name="surround_sound" 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,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/> - </mixPort> - <mixPort name="record_24" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/> - <profile name="" format="AUDIO_FORMAT_PCM_8_24_BIT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/> - <profile name="" format="AUDIO_FORMAT_PCM_FLOAT" - samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,96000,192000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4"/> - </mixPort> - <mixPort name="voice_rx" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,16000,48000" channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </mixPort> - <mixPort name="hifi_input" role="sink" /> - </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"/> - </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="Line" type="AUDIO_DEVICE_OUT_LINE" 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,AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - <devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - <devicePort tagName="FM" type="AUDIO_DEVICE_OUT_FM" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/> - </devicePort> - - <!-- Input devices declaration, i.e. Source DEVICE PORT --> - <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="FM Tuner" type="AUDIO_DEVICE_IN_FM_TUNER" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" - channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO"/> - </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,48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> - </devicePort> - <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"> - </devicePort> - <devicePort tagName="USB Headset In" type="AUDIO_DEVICE_IN_USB_HEADSET" role="source"> - </devicePort> - - </devicePorts> - <!-- route declaration, i.e. list all available sources for a given sink --> - <routes> - <route type="mix" sink="Earpiece" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="Speaker" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="Wired Headset" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> - <route type="mix" sink="Wired Headphones" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> - <route type="mix" sink="Line" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,dsd_compress_passthrough,voip_rx"/> - <route type="mix" sink="HDMI" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough"/> - <route type="mix" sink="Proxy" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/> - <route type="mix" sink="FM" - sources="primary output"/> - <route type="mix" sink="BT SCO" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="BT SCO Headset" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="BT SCO Car Kit" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/> - <route type="mix" sink="USB Device Out" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback"/> - <route type="mix" sink="USB Headset Out" - sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx,hifi_playback"/> - <route type="mix" sink="Telephony Tx" - sources="voice_tx"/> - <route type="mix" sink="voice_rx" - sources="Telephony Rx"/> - <route type="mix" sink="primary input" - sources="Wired Headset Mic,BT SCO Headset Mic,FM Tuner,USB Device In,USB Headset In,Telephony Rx"/> - <route type="mix" sink="voip_tx" - sources="Built-In Mic,Built-In Back Mic,BT SCO Headset Mic,USB Device In,USB Headset In"/> - <route type="mix" sink="surround_sound" - sources="Built-In Mic,Built-In Back Mic"/> - <route type="mix" sink="record_24" - sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic"/> - <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" /> - </routes> - - </module> - - <!-- A2DP Input Audio HAL --> - <xi:include href="/vendor/etc/a2dp_in_audio_policy_configuration.xml"/> - - <!-- Usb Audio HAL --> - <module name="usb" halVersion="2.0"> - <mixPorts> - <mixPort name="usb_accessory output" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - </mixPorts> - <devicePorts> - <devicePort tagName="USB Host Out" type="AUDIO_DEVICE_OUT_USB_ACCESSORY" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - </devicePorts> - <routes> - <route type="mix" sink="USB Host Out" - sources="usb_accessory output"/> - </routes> - </module> - - <!-- Remote Submix Audio HAL --> - <xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/> - - <!-- Bluetooth Audio HAL --> - <xi:include href="/vendor/etc/bluetooth_qti_audio_policy_configuration.xml"/> - - </modules> - <!-- End of Modules section --> - - <!-- Volume section --> - - <xi:include href="/vendor/etc/audio_policy_volumes.xml"/> - <xi:include href="/vendor/etc/default_volume_tables.xml"/> - - <!-- End of Volume section --> - -</audioPolicyConfiguration> diff --git a/audio/bluetooth_qti_audio_policy_configuration.xml b/audio/bluetooth_qti_audio_policy_configuration.xml deleted file mode 100644 index f0b2506..0000000 --- a/audio/bluetooth_qti_audio_policy_configuration.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Bluetooth Audio HAL Audio Policy Configuration file --> -<module name="bluetooth_qti" 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> diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h index 93e1b84..217f59b 100644 --- a/bluetooth/bdroid_buildcfg.h +++ b/bluetooth/bdroid_buildcfg.h @@ -1,6 +1,8 @@ /* + * * Copyright (c) 2013, The Linux Foundation. All rights reserved. - * Not a Contribution. + * Not a Contribution, Apache license notifications and license are retained + * for attribution purposes only. * * Copyright (C) 2012 The Android Open Source Project * @@ -21,8 +23,8 @@ #define _BDROID_BUILDCFG_H // Disables read remote device feature #define MAX_ACL_CONNECTIONS 16 -#define MAX_L2CAP_CHANNELS 32 +#define MAX_L2CAP_CHANNELS 16 #define BLE_VND_INCLUDED TRUE -#define GATT_MAX_PHY_CHANNEL 10 -#define AVDT_NUM_SEPS 35 +/* Increasing SEPs to 12 from 6 to support SHO/MCast i.e. two streams per codec */ +#define AVDT_NUM_SEPS 12 #endif diff --git a/configs/component-overrides-qti.xml b/configs/component-overrides-qti.xml deleted file mode 100644 index 4e257b0..0000000 --- a/configs/component-overrides-qti.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2019 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. ---> -<config> - <component-override package="com.android.bluetooth" > - <component class=".a2dpsink.A2dpSinkService" enabled="true" /> - <component class=".avrcp.AvrcpTargetService" enabled="false" /> - </component-override> -</config> diff --git a/configs/component-overrides.xml b/configs/component-overrides.xml index a4fd25e..21893be 100644 --- a/configs/component-overrides.xml +++ b/configs/component-overrides.xml @@ -16,7 +16,6 @@ <config> <component-override package="com.android.bluetooth" > <component class=".avrcpcontroller.AvrcpControllerService" enabled="true" /> - <component class=".ba.BATService" enabled="true" /> <component class=".hid.HidDeviceService" enabled="false" /> <component class=".sap.SapService" enabled="true" /> </component-override> diff --git a/properties.mk b/properties.mk index 93c4229..56092e6 100644 --- a/properties.mk +++ b/properties.mk @@ -32,7 +32,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.vendor.audio.hifi.int_codec=true \ ro.af.client_heap_size_kbyte=7168 \ vendor.audio.volume.headset.gain.depcal=true \ - persist.vendor.bt.aac_frm_ctl.enabled=true \ vendor.audio.spkr_prot.tx.sampling_rate=48000 PRODUCT_PROPERTY_OVERRIDES += \ @@ -83,20 +82,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.config.vc_call_vol_steps=7 \ vendor.audio.adm.buffering.ms=6 -PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - persist.bluetooth.a2dp_offload.disabled=false \ - ro.bluetooth.a2dp_offload.supported=true \ - vendor.audio.feature.a2dp_offload.enable=true - # Bluetooth PRODUCT_PROPERTY_OVERRIDES += \ vendor.qcom.bluetooth.soc=cherokee PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \ - persist.vendor.bt.a2dp.aac_whitelist=false \ - persist.vendor.qcom.bluetooth.enable.splita2dp=true \ - persist.vendor.qcom.bluetooth.a2dp_offload_cap=sbc-aptx-aptxhd-aac-ldac \ - ro.bluetooth.library_name=libbluetooth_qti.so \ vendor.bluetooth.soc=cherokee # Camera diff --git a/proprietary-files.txt b/proprietary-files.txt index 0c09693..b03a929 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -68,12 +68,6 @@ vendor/lib/soundfx/libqcbassboost.so|73339450a42b598a3c13e67b3d4a2266d986fea2 vendor/lib/soundfx/libqcreverb.so|eb437cd5e264b1adb4546c6a5617c5da17be5839 vendor/lib/soundfx/libqcvirt.so|ee9eaa81bb24ac0379e06b44ef257967a4d32614 -# Audio (A2dp) - from jasmine -vendor/lib/btaudio_offload_if.so|d9a9795e173dffd4b5ee000acac66c1ad6f1648c -vendor/lib/hw/audio.bluetooth_qti.default.so|c64b101dd33042d2f702ab5059231ca9684fc1d0 -vendor/lib/hw/vendor.qti.hardware.bluetooth_audio@2.0-impl.so|947afef6bf7a05a9a2b45022edfed06bd7c00e64 -vendor/lib/libbluetooth_audio_session_qti.so|53fd0369c50fbaef12c22e25e3073a6fc9f05bb7 - # Bluetooth - from jasmine vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti|57a0a575a2b1b96176fda1bcb84ea8371c4070d1 vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc|a979981c55f3dcaf6cf2212e71b901ca4d58b959 @@ -84,9 +78,9 @@ vendor/lib64/libbtnv.so|08fc5c0a38eca63ebe6f0cd854f6525537141d44 vendor/lib64/vendor.qti.hardware.bluetooth_sar@1.0.so|9346946b110086a6b473c8226e072e9a0cdbb87e vendor/lib64/vendor.qti.hardware.fm@1.0.so|073cace3aa8d0ffa025d9df67c45f8a907109339 -# Bluetooth (aptX) - from jasmine -vendor/lib/rfsa/adsp/capi_v2_aptX_Classic.so|8305c614ebf13f84f15989631b8fdfdb9828d9be -vendor/lib/rfsa/adsp/capi_v2_aptX_HD.so|eb0e912d25b06f977d5a89345c72d142b7ffb8ae +# Bluetooth (aptX) - from crosshatch-user 10 QP1A.190711.020 5800535 release-keys +product/lib64/libaptX_encoder.so|df1c89d7af1bb35808d5fe3496b04ba066c10cbc +product/lib64/libaptXHD_encoder.so|e13fa70c97caaa24d061678bdee608eb8850a69e # Charger - from jasmine vendor/bin/hvdcp_opti|120837d6d44abfd86515731dd26183be9cdd5596 @@ -103,11 +103,9 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.bluetooth.audio@2.0-impl \ - audio.bluetooth.default \ - vendor.qti.hardware.bluetooth_audio@2.0.vendor + audio.bluetooth.default PRODUCT_PACKAGES += \ - liba2dpoffload \ libhdmiedid \ libhfp \ libsndmonitor @@ -115,11 +113,8 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ $(LOCAL_PATH)/audio/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \ - $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_policy_configuration_a2dp_offload_disabled_qti.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio/audio_policy_configuration_a2dp_offload_disabled.xml \ + $(LOCAL_PATH)/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \ - $(LOCAL_PATH)/audio/bluetooth_qti_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_qti_audio_policy_configuration.xml \ $(LOCAL_PATH)/audio/graphite_ipc_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/graphite_ipc_platform_info.xml \ $(LOCAL_PATH)/audio/listen_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/listen_platform_info.xml @@ -152,7 +147,6 @@ PRODUCT_BOOT_JARS += \ # Bluetooth PRODUCT_PACKAGES += \ - BluetoothQti \ vendor.qti.hardware.btconfigstore@1.0.vendor # Camera @@ -189,8 +183,7 @@ PRODUCT_COPY_FILES += \ # Component overrides PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \ - $(LOCAL_PATH)/configs/component-overrides-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/component-overrides.xml + $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml # Display PRODUCT_PACKAGES += \ |