summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2019-01-18 12:28:56 -0800
committerEric Laurent <elaurent@google.com>2019-01-18 17:28:50 -0800
commitb58d94f5bef85ef7efd2512e7dc9c6fef1b4007e (patch)
tree8314fc6043a40523d42638b5e8d3c921b5bcb6c8
parent3b48c97b54e301fe2a180bd68683f7c438469533 (diff)
downloadbonito-b58d94f5bef85ef7efd2512e7dc9c6fef1b4007e.tar.gz
audio policy config: add list of supported A2DP codecs
Also move audio HAL version to 5.0 Bug: 111812273 Test: play music over A2DP headphones Change-Id: I2a3722a588b6f532d95159eec648add0b3ace5a0
-rw-r--r--audio_policy_configuration.xml9
-rw-r--r--device.mk4
-rw-r--r--manifest.xml4
3 files changed, 10 insertions, 7 deletions
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml
index 9d079b35..436d81e0 100644
--- a/audio_policy_configuration.xml
+++ b/audio_policy_configuration.xml
@@ -130,15 +130,18 @@
</devicePort>
<devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">
</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_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<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">
+ <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
+ encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<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">
+ <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
+ encodedFormats="AUDIO_FORMAT_LDAC AUDIO_FORMAT_APTX AUDIO_FORMAT_APTX_HD AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100,48000,88200,96000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
diff --git a/device.mk b/device.mk
index 9f259d15..bb60ae09 100644
--- a/device.mk
+++ b/device.mk
@@ -517,8 +517,8 @@ PRODUCT_PACKAGES += \
audio.hearing_aid.default
PRODUCT_PACKAGES += \
- android.hardware.audio@4.0-impl:32 \
- android.hardware.audio.effect@4.0-impl:32 \
+ android.hardware.audio@5.0-impl:32 \
+ android.hardware.audio.effect@5.0-impl:32 \
android.hardware.broadcastradio@1.0-impl \
android.hardware.soundtrigger@2.1-impl \
android.hardware.audio@2.0-service
diff --git a/manifest.xml b/manifest.xml
index afae5587..55ddcdfb 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -2,7 +2,7 @@
<hal format="hidl">
<name>android.hardware.audio</name>
<transport>hwbinder</transport>
- <version>4.0</version>
+ <version>5.0</version>
<interface>
<name>IDevicesFactory</name>
<instance>default</instance>
@@ -11,7 +11,7 @@
<hal format="hidl">
<name>android.hardware.audio.effect</name>
<transport>hwbinder</transport>
- <version>4.0</version>
+ <version>5.0</version>
<interface>
<name>IEffectsFactory</name>
<instance>default</instance>