diff options
| author | Mikhail Naganov <mnaganov@google.com> | 2021-10-28 09:23:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-28 09:23:22 +0000 |
| commit | af850c69a12cd92bf02f3bfca18c955c0c1eb4be (patch) | |
| tree | f6f860ad8dc9e20a65fe623b43fb43586ff90347 | |
| parent | d951a1c34db5975642fa767b5160a97b69a2229d (diff) | |
| parent | 9a58c185cdc45ba22cd3d704eca957b223bd3289 (diff) | |
| download | hikey-af850c69a12cd92bf02f3bfca18c955c0c1eb4be.tar.gz | |
Update audio_policy_configuration.xml file for HAL V7 am: d5148dd5db am: 8d255c67ce am: ec01d54ca8 am: 9a58c185cd
Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1872178
Change-Id: I1fa602f06878e7bfb03bcccefd1cc594998f2a19
| -rw-r--r-- | audio/audio_policy_configuration.xml | 8 | ||||
| -rw-r--r-- | device-common.mk | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml index 114db1a8..720dc059 100644 --- a/audio/audio_policy_configuration.xml +++ b/audio/audio_policy_configuration.xml @@ -14,7 +14,7 @@ limitations under the License. --> -<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude"> +<audioPolicyConfiguration version="7.0" xmlns:xi="http://www.w3.org/2001/XInclude"> <globalConfiguration speaker_drc_enabled="false"/> @@ -33,7 +33,7 @@ </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" + samplingRates="8000 11025 12000 16000 22050 24000 32000 44100 48000" channelMasks="AUDIO_CHANNEL_IN_MONO"/> </mixPort> </mixPorts> @@ -84,7 +84,7 @@ </module> <!-- A2dp Input Audio HAL --> - <xi:include href="a2dp_in_audio_policy_configuration.xml"/> + <xi:include href="a2dp_in_audio_policy_configuration_7_0.xml"/> <!-- Usb Audio HAL --> <xi:include href="usb_audio_policy_configuration.xml"/> @@ -93,7 +93,7 @@ <xi:include href="r_submix_audio_policy_configuration.xml"/> <!-- Bluetooth Audio HAL --> - <xi:include href="bluetooth_audio_policy_configuration.xml"/> + <xi:include href="bluetooth_audio_policy_configuration_7_0.xml"/> </modules> <!-- End of Modules section --> diff --git a/device-common.mk b/device-common.mk index 01827c0c..6d047521 100644 --- a/device-common.mk +++ b/device-common.mk @@ -226,8 +226,8 @@ PRODUCT_COPY_FILES += \ device/linaro/hikey/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ device/linaro/hikey/audio/audio_policy_configuration_bluetooth_legacy_hal.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_bluetooth_legacy_hal.xml \ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration_7_0.xml \ + frameworks/av/services/audiopolicy/config/bluetooth_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml \ frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ |