summaryrefslogtreecommitdiff
authorqi.yuan <qi.yuan@amlogic.com>2018-04-12 08:53:41 (GMT)
committer Ting Wang <ting.wang@amlogic.com>2018-04-15 04:52:15 (GMT)
commit78a10e7358c98391d664c2c8d0d199385a14e6d3 (patch)
tree410718b5bf7fd52ca8dc501e49f2311ab1d3893a
parent8352b885811f1c4aa26237b97ec2c7bf7275562b (diff)
downloaddarwin-78a10e7358c98391d664c2c8d0d199385a14e6d3.zip
darwin-78a10e7358c98391d664c2c8d0d199385a14e6d3.tar.gz
darwin-78a10e7358c98391d664c2c8d0d199385a14e6d3.tar.bz2
audio: merge audio_policy.conf 8.1 to p and disable BT in[1/1]
PD#164109 merge audio hal to android p Change-Id: I0dde9883c16fb51de5dc0ae431f0639198d38e8a
Diffstat
-rw-r--r--files/audio_policy.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/files/audio_policy.conf b/files/audio_policy.conf
index 08a5b35..09808e9 100644
--- a/files/audio_policy.conf
+++ b/files/audio_policy.conf
@@ -128,7 +128,7 @@ audio_hw_modules {
sampling_rates 48000
channel_masks AUDIO_CHANNEL_OUT_STEREO
formats AUDIO_FORMAT_PCM_16_BIT
- devices speaker|hdmi_arc|SPDIF|wired_headphone|wired_headset|BT_sco|BT_sco_headset
+ devices speaker|hdmi_out|hdmi_arc|SPDIF|wired_headphone|wired_headset|BT_sco|BT_sco_headset
flags AUDIO_OUTPUT_FLAG_PRIMARY
}
offload {
@@ -138,7 +138,7 @@ audio_hw_modules {
sampling_rates dynamic
channel_masks dynamic
formats dynamic
- devices speaker|hdmi_arc|SPDIF|wired_headphone|wired_headset
+ devices speaker|hdmi_out|hdmi_arc|SPDIF|wired_headphone|wired_headset
#flags AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD|AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_IEC958_NONAUDIO|AUDIO_OUTPUT_FLAG_HW_AV_SYNC
flags AUDIO_OUTPUT_FLAG_DIRECT|AUDIO_OUTPUT_FLAG_HW_AV_SYNC
}
@@ -162,7 +162,7 @@ audio_hw_modules {
sampling_rates 8000|11025|12000|16000|22050|24000|32000|44100|48000
channel_masks AUDIO_CHANNEL_IN_MONO|AUDIO_CHANNEL_IN_STEREO
formats AUDIO_FORMAT_PCM_16_BIT
- devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|AUDIO_DEVICE_IN_WIRED_HEADSET|hdmi_in|line_in|tuner|spdif_in
+ devices AUDIO_DEVICE_IN_BUILTIN_MIC|AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET|hdmi_in|line_in|tuner|spdif_in
}
}
}