Merge branch '334devices-s-FP4_SP1Y' into 'staging/v1-s' (687a24d4) · Commits · e / devices / android_device_fairphone_FP4

BoardConfig.mk

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -42,7 +42,6 @@ AB_OTA_PARTITIONS += \
	# Audio		# Audio
	AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true		AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true
	AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true		AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
	AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
	AUDIO_FEATURE_ENABLED_HDMI_SPK := true		AUDIO_FEATURE_ENABLED_HDMI_SPK := true
	AUDIO_FEATURE_ENABLED_INSTANCE_ID := true		AUDIO_FEATURE_ENABLED_INSTANCE_ID := true
	AUDIO_FEATURE_ENABLED_SSR := true		AUDIO_FEATURE_ENABLED_SSR := true
	@@ -51,7 +50,6 @@ USE_CUSTOM_AUDIO_POLICY := 1

	# Bluetooth		# Bluetooth
	BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include		BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth/include
	TARGET_USE_QTI_BT_STACK := true

	# Bootloader		# Bootloader
	TARGET_BOOTLOADER_BOARD_NAME := FP4		TARGET_BOOTLOADER_BOARD_NAME := FP4
	@@ -153,7 +151,7 @@ TARGET_USERIMAGES_USE_F2FS := true
	ENABLE_VENDOR_RIL_SERVICE := true		ENABLE_VENDOR_RIL_SERVICE := true

	# Security patch level		# Security patch level
	VENDOR_SECURITY_PATCH := 2022-11-05		VENDOR_SECURITY_PATCH := 2022-12-05

	# SEPolicy		# SEPolicy
	include device/qcom/sepolicy_vndr/SEPolicy.mk		include device/qcom/sepolicy_vndr/SEPolicy.mk

audio/audio_io_policy.conf

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -13,9 +13,9 @@
	outputs {		outputs {
	default {		default {
	flags AUDIO_OUTPUT_FLAG_PRIMARY		flags AUDIO_OUTPUT_FLAG_PRIMARY
	formats AUDIO_FORMAT_PCM_16_BIT		formats AUDIO_FORMAT_PCM_24_BIT_PACKED
	sampling_rates 48000		sampling_rates 48000
	bit_width 16		bit_width 24
	app_type 69937		app_type 69937
	}		}
	proaudio {		proaudio {
	@@ -34,9 +34,9 @@ outputs {
	}		}
	deep_buffer {		deep_buffer {
	flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER		flags AUDIO_OUTPUT_FLAG_DEEP_BUFFER
	formats AUDIO_FORMAT_PCM_16_BIT		formats AUDIO_FORMAT_PCM_24_BIT_PACKED
	sampling_rates 48000		sampling_rates 48000
	bit_width 16		bit_width 24
	app_type 69936		app_type 69936
	}		}
	direct_pcm_16 {		direct_pcm_16 {

audio/audio_policy_configuration.xml

+18 −54

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="UTF-8" standalone="yes"?>		<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
	<!-- Copyright (c) 2016-2020, The Linux Foundation. All rights reserved		<!-- Copyright (c) 2016-2021, The Linux Foundation. All rights reserved
	Not a Contribution.		Not a Contribution.
	-->		-->
	<!-- Copyright (C) 2015 The Android Open Source Project		<!-- Copyright (C) 2015 The Android Open Source Project
	@@ -54,13 +54,12 @@
	<item>Telephony Tx</item>		<item>Telephony Tx</item>
	<item>Built-In Mic</item>		<item>Built-In Mic</item>
	<item>Built-In Back Mic</item>		<item>Built-In Back Mic</item>
	<item>FM Tuner</item>
	<item>Telephony Rx</item>		<item>Telephony Rx</item>
	</attachedDevices>		</attachedDevices>
	<defaultOutputDevice>Speaker</defaultOutputDevice>		<defaultOutputDevice>Speaker</defaultOutputDevice>
	<mixPorts>		<mixPorts>
	<mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST\|AUDIO_OUTPUT_FLAG_PRIMARY">		<mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_FAST\|AUDIO_OUTPUT_FLAG_PRIMARY">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
	samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
	</mixPort>		</mixPort>
	<mixPort name="raw" role="source"		<mixPort name="raw" role="source"
	@@ -70,7 +69,7 @@
	</mixPort>		</mixPort>
	<mixPort name="deep_buffer" role="source"		<mixPort name="deep_buffer" role="source"
	flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">		flags="AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
	samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
	</mixPort>		</mixPort>
	<mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT\|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">		<mixPort name="mmap_no_irq_out" role="source" flags="AUDIO_OUTPUT_FLAG_DIRECT\|AUDIO_OUTPUT_FLAG_MMAP_NOIRQ">
	@@ -80,8 +79,6 @@
	<mixPort name="hifi_playback" role="source" />		<mixPort name="hifi_playback" role="source" />
	<mixPort name="compress_passthrough" role="source"		<mixPort name="compress_passthrough" role="source"
	flags="AUDIO_OUTPUT_FLAG_DIRECT\|AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD\|AUDIO_OUTPUT_FLAG_NON_BLOCKING">		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>
	<mixPort name="direct_pcm" role="source"		<mixPort name="direct_pcm" role="source"
	flags="AUDIO_OUTPUT_FLAG_DIRECT">		flags="AUDIO_OUTPUT_FLAG_DIRECT">
	@@ -133,9 +130,6 @@
	<profile name="" format="AUDIO_FORMAT_WMA_PRO"		<profile name="" format="AUDIO_FORMAT_WMA_PRO"
	samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"		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"/>		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_VORBIS"
	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_ADTS_LC"		<profile name="" format="AUDIO_FORMAT_AAC_ADTS_LC"
	samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,64000,88200,96000"
	channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>		channelMasks="AUDIO_CHANNEL_OUT_STEREO,AUDIO_CHANNEL_OUT_MONO"/>
	@@ -162,7 +156,7 @@
	channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>		channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
	</mixPort>		</mixPort>

	<mixPort name="primary input" role="sink" maxOpenCount="2" maxActiveCount="2">		<mixPort name="primary input" role="sink">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
	channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>		channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
	@@ -181,7 +175,7 @@
	channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>		channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
	<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"		<profile name="" format="AUDIO_FORMAT_PCM_FLOAT"
	samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"
	channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>		channelMasks="AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_INDEX_MASK_2,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>
	</mixPort>		</mixPort>
	<mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">		<mixPort name="record_24" role="sink" maxOpenCount="2" maxActiveCount="2">
	<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"		<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
	@@ -221,7 +215,7 @@
	<!-- Output devices declaration, i.e. Sink DEVICE PORT -->		<!-- Output devices declaration, i.e. Sink DEVICE PORT -->
	<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">		<devicePort tagName="Earpiece" type="AUDIO_DEVICE_OUT_EARPIECE" role="sink">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/>		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_MONO"/>
	</devicePort>		</devicePort>
	<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">		<devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER" address="">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	@@ -257,38 +251,34 @@
	</devicePort>		</devicePort>
	<devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">		<devicePort tagName="HDMI" type="AUDIO_DEVICE_OUT_AUX_DIGITAL" role="sink">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>		samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
	</devicePort>		</devicePort>
	<devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">		<devicePort tagName="Proxy" type="AUDIO_DEVICE_OUT_PROXY" role="sink">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>		samplingRates="8000,11025,16000,22050,32000,44100,48000,64000,88200,96000,128000,176400,192000"/>
	</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>
	<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"		<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 AUDIO_FORMAT_APTX_TWSP">		encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
	</devicePort>		</devicePort>
	<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"		<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 AUDIO_FORMAT_APTX_TWSP">		encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
	</devicePort>		</devicePort>
	<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"		<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 AUDIO_FORMAT_APTX_TWSP">		encodedFormats="AUDIO_FORMAT_SBC AUDIO_FORMAT_AAC AUDIO_FORMAT_LDAC">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>		samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
	</devicePort>		</devicePort>
	<devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">		<devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>		samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>
	</devicePort>		</devicePort>
	<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">		<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>		samplingRates="44100,48000,64000,88200,96000,128000,176400,192000"/>
	</devicePort>		</devicePort>

	<!-- Input devices declaration, i.e. Source DEVICE PORT -->		<!-- Input devices declaration, i.e. Source DEVICE PORT -->
	@@ -302,11 +292,6 @@
	samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
	channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>		channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>
	</devicePort>		</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">		<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
	<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"		<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
	samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"		samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
	@@ -342,8 +327,6 @@
	sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx"/>		sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,compress_passthrough,voip_rx"/>
	<route type="mix" sink="Proxy"		<route type="mix" sink="Proxy"
	sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>		sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload"/>
	<route type="mix" sink="FM"
	sources="primary output"/>
	<route type="mix" sink="BT SCO"		<route type="mix" sink="BT SCO"
	sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>		sources="primary output,raw,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>
	<route type="mix" sink="BT SCO Headset"		<route type="mix" sink="BT SCO Headset"
	@@ -359,7 +342,7 @@
	<route type="mix" sink="voice_rx"		<route type="mix" sink="voice_rx"
	sources="Telephony Rx"/>		sources="Telephony Rx"/>
	<route type="mix" sink="primary input"		<route type="mix" sink="primary input"
	sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,FM Tuner,Telephony Rx"/>		sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,BT SCO Headset Mic,Telephony Rx"/>
	<route type="mix" sink="usb_surround_sound"		<route type="mix" sink="usb_surround_sound"
	sources="USB Device In,USB Headset In"/>		sources="USB Device In,USB Headset In"/>
	<route type="mix" sink="voip_tx"		<route type="mix" sink="voip_tx"
	@@ -383,27 +366,8 @@

	</module>		</module>

	<!-- A2DP Audio HAL -->		<!-- A2DP Input Audio HAL -->
	<module name="a2dp" halVersion="2.0">		<xi:include href="/vendor/etc/a2dp_in_audio_policy_configuration.xml"/>
	<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>

	<!-- Usb Audio HAL -->		<!-- Usb Audio HAL -->
	<module name="usb" halVersion="2.0">		<module name="usb" halVersion="2.0">
	@@ -428,8 +392,8 @@
	<!-- Remote Submix Audio HAL -->		<!-- Remote Submix Audio HAL -->
	<xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>		<xi:include href="/vendor/etc/r_submix_audio_policy_configuration.xml"/>

	<!-- Bluetooth Audio HAL for hearing aid -->		<!-- Bluetooth Audio HAL for Hearing aid -->
	<xi:include href="/vendor/etc/bluetooth_qti_hearing_aid_audio_policy_configuration.xml"/>		<xi:include href="/vendor/etc/bluetooth_hearing_aid_audio_policy_configuration.xml"/>

	</modules>		</modules>
	<!-- End of Modules section -->		<!-- End of Modules section -->

audio/audio_policy_configuration_a2dp_offload_disabled.xml

0 → 100644

+387 −0

File added.

Preview size limit exceeded, changes collapsed.

audio/bluetooth_qti_hearing_aid_audio_policy_configuration.xml→audio/bluetooth_hearing_aid_audio_policy_configuration.xml

+20 −0

Original line number	Original line	Diff line number	Diff line
	<?xml version="1.0" encoding="UTF-8"?>		<?xml version="1.0" encoding="UTF-8"?>
	<!-- Copyright (c) 2020 The Linux Foundation. All rights reserved.
	Not a contribution.
	-->
	<!-- Copyright (C) 2018 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.
	-->

	<!-- Bluetooth Audio HAL Audio Policy Configuration file -->		<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
	<module name="bluetooth_qti" halVersion="2.0">		<module name="bluetooth" halVersion="2.0">
	<mixPorts>		<mixPorts>
	<!-- Hearing AIDs Audio Ports -->		<!-- Hearing AIDs Audio Ports -->
	<mixPort name="hearing aid output" role="source">		<mixPort name="hearing aid output" role="source">