diff options
| -rw-r--r-- | audio/a2dp_audio_policy_configuration.xml | 48 | ||||
| -rw-r--r-- | audio/audio_policy_volumes.xml | 179 | ||||
| -rw-r--r-- | audio/default_volume_tables.xml | 70 | ||||
| -rw-r--r-- | audio/r_submix_audio_policy_configuration.xml | 47 | ||||
| -rw-r--r-- | audio/sound_trigger_mixer_paths.xml | 13 | ||||
| -rw-r--r-- | audio/usb_audio_policy_configuration.xml | 43 | ||||
| -rwxr-xr-x | device.mk | 12 |
7 files changed, 19 insertions, 393 deletions
diff --git a/audio/a2dp_audio_policy_configuration.xml b/audio/a2dp_audio_policy_configuration.xml deleted file mode 100644 index ced7463..0000000 --- a/audio/a2dp_audio_policy_configuration.xml +++ /dev/null @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- A2dp Audio HAL Audio Policy Configuration file --> -<module name="a2dp" halVersion="2.0"> - <mixPorts> - <mixPort name="a2dp output" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - <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 Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="44100" - 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" - 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" - channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <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="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="a2dp input" - sources="BT A2DP In"/> - </routes> -</module> diff --git a/audio/audio_policy_volumes.xml b/audio/audio_policy_volumes.xml deleted file mode 100644 index 43a47b0..0000000 --- a/audio/audio_policy_volumes.xml +++ /dev/null @@ -1,179 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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. ---> -<!-- Volume section defines a volume curve for a given use case and device category. -It contains a list of points of this curve expressing the attenuation in Millibels for a given -volume index from 0 to 100. -<volume stream=”AUDIO_STREAM_MUSIC” deviceCategory=””> -<point>0,-9600</point> -<point>100,0</point> -</volume> ---> - -<volumes> - <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_HEADSET"> - <point>0,-4200</point> - <point>33,-2800</point> - <point>66,-1400</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_SPEAKER"> - <point>0,-2400</point> - <point>33,-1600</point> - <point>66,-800</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EARPIECE"> - <point>0,-2400</point> - <point>33,-1600</point> - <point>66,-800</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_VOICE_CALL" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_HEADSET"> - <point>1,-3000</point> - <point>33,-2600</point> - <point>66,-2200</point> - <point>100,-1800</point> - </volume> - <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER"> - <point>1,-2970</point> - <point>33,-2010</point> - <point>66,-1020</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER"> - <point>1,-2970</point> - <point>33,-2010</point> - <point>66,-1020</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER"> - <point>1,-2970</point> - <point>33,-2010</point> - <point>66,-1020</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_HEADSET"> - <point>0,-4200</point> - <point>33,-2800</point> - <point>66,-1400</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_SPEAKER"> - <point>0,-2400</point> - <point>33,-1600</point> - <point>66,-800</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EARPIECE"> - <point>0,-4200</point> - <point>33,-2800</point> - <point>66,-1400</point> - <point>100,0</point> - </volume> - <volume stream="AUDIO_STREAM_BLUETOOTH_SCO" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_HEADSET"> - <point>1,-3000</point> - <point>33,-2600</point> - <point>66,-2200</point> - <point>100,-1800</point> - </volume> - <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_HEADSET"> - <point>1,-3000</point> - <point>33,-2600</point> - <point>66,-2200</point> - <point>100,-1800</point> - </volume> - <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_SYSTEM_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="SILENT_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="SILENT_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_TTS" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="SILENT_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_ACCESSIBILITY" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="DEFAULT_MEDIA_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_REROUTING" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_HEADSET" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_SPEAKER" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EARPIECE" - ref="FULL_SCALE_VOLUME_CURVE"/> - <volume stream="AUDIO_STREAM_PATCH" deviceCategory="DEVICE_CATEGORY_EXT_MEDIA" - ref="FULL_SCALE_VOLUME_CURVE"/> -</volumes> - diff --git a/audio/default_volume_tables.xml b/audio/default_volume_tables.xml deleted file mode 100644 index 3a787fa..0000000 --- a/audio/default_volume_tables.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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. ---> -<!-- Default Volume Tables included by Audio Policy Configuration file --> -<!-- Full Default Volume table for all device category --> -<volumes> - <reference name="FULL_SCALE_VOLUME_CURVE"> - <!-- Full Scale reference Volume Curve --> - <point>0,0</point> - <point>100,0</point> - </reference> - <reference name="SILENT_VOLUME_CURVE"> - <point>0,-9600</point> - <point>100,-9600</point> - </reference> - <reference name="DEFAULT_SYSTEM_VOLUME_CURVE"> - <!-- Default System reference Volume Curve --> - <point>1,-2400</point> - <point>33,-1800</point> - <point>66,-1200</point> - <point>100,-600</point> - </reference> - <reference name="DEFAULT_MEDIA_VOLUME_CURVE"> - <!-- Default Media reference Volume Curve --> - <point>1,-6000</point> - <point>26,-4100</point> - <point>53,-2100</point> - <point>100,0</point> - </reference> - <reference name="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"> - <!--Default Volume Curve --> - <point>1,-4950</point> - <point>33,-3350</point> - <point>66,-1700</point> - <point>100,0</point> - </reference> - <reference name="DEFAULT_DEVICE_CATEGORY_SPEAKER_VOLUME_CURVE"> - <!-- Default is Speaker Media Volume Curve --> - <point>1,-4600</point> - <point>56,-2200</point> - <point>93,-800</point> - <point>100,0</point> - </reference> - <reference name="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"> - <!--Default Volume Curve --> - <point>1,-4950</point> - <point>33,-3350</point> - <point>66,-1700</point> - <point>100,0</point> - </reference> - <reference name="DEFAULT_DEVICE_CATEGORY_EXT_MEDIA_VOLUME_CURVE"> - <!-- Default is Ext Media System Volume Curve --> - <point>1,-5800</point> - <point>20,-4000</point> - <point>60,-2100</point> - <point>100,-1000</point> - </reference> -</volumes> diff --git a/audio/r_submix_audio_policy_configuration.xml b/audio/r_submix_audio_policy_configuration.xml deleted file mode 100644 index dc2a5ec..0000000 --- a/audio/r_submix_audio_policy_configuration.xml +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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. ---> -<!-- Remote Submix Audio Policy Configuration file --> -<module name="r_submix" halVersion="2.0"> - <attachedDevices> - <item>Remote Submix In</item> - </attachedDevices> - <mixPorts> - <mixPort name="r_submix output" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </mixPort> - <mixPort name="r_submix input" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> - </mixPort> - </mixPorts> - <devicePorts> - <devicePort tagName="Remote Submix Out" type="AUDIO_DEVICE_OUT_REMOTE_SUBMIX" role="sink"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> - </devicePort> - <devicePort tagName="Remote Submix In" type="AUDIO_DEVICE_IN_REMOTE_SUBMIX" role="source"> - <profile name="" format="AUDIO_FORMAT_PCM_16_BIT" - samplingRates="48000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/> - </devicePort> - </devicePorts> - <routes> - <route type="mix" sink="Remote Submix Out" - sources="r_submix output"/> - <route type="mix" sink="r_submix input" - sources="Remote Submix In"/> - </routes> -</module> diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml index 29ab7ed..0125371 100644 --- a/audio/sound_trigger_mixer_paths.xml +++ b/audio/sound_trigger_mixer_paths.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="ISO-8859-1"?> -<!--- Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. --> +<!--- Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. --> <!--- --> <!--- Redistribution and use in source and binary forms, with or without --> <!--- modification, are permitted provided that the following conditions are --> @@ -44,6 +44,10 @@ <ctl name="AIF4_MAD Mixer SLIM TX12" value="0" /> <ctl name="AIF4_MAD Mixer SLIM TX13" value="0" /> <ctl name="CPE AFE MAD Enable" value="0"/> + <ctl name="CLK MODE" value="EXTERNAL" /> + <ctl name="EC BUF MUX INP" value="ZERO" /> + <ctl name="ADC MUX1" value="DMIC" /> + <ctl name="DMIC MUX1" value="ZERO" /> <path name="listen-voice-wakeup-1"> <ctl name="SLIMBUS_5_TX LSM Function" value="AUDIO" /> @@ -87,6 +91,13 @@ <ctl name="CPE AFE MAD Enable" value="1"/> </path> + <path name="listen-cpe-handset-mic-ecpp"> + <ctl name="CLK MODE" value="INTERNAL" /> + <ctl name="EC BUF MUX INP" value="DEC1" /> + <ctl name="ADC MUX1" value="DMIC" /> + <ctl name="DMIC MUX1" value="DMIC0" /> + </path> + <!-- path name used for low bandwidth FTRT codec interface --> <path name="listen-cpe-handset-mic low-speed-intf"> <ctl name="MADONOFF Switch" value="1" /> diff --git a/audio/usb_audio_policy_configuration.xml b/audio/usb_audio_policy_configuration.xml deleted file mode 100644 index 1630a94..0000000 --- a/audio/usb_audio_policy_configuration.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- 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. ---> -<!-- USB Audio HAL Audio Policy Configuration file --> - -<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> - <mixPort name="usb_device output" role="source"/> - <mixPort name="usb_device input" role="sink"/> - </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> - <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink"/> - <devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source"/> - </devicePorts> - <routes> - <route type="mix" sink="USB Host Out" - sources="usb_accessory output"/> - <route type="mix" sink="USB Device Out" - sources="usb_device output"/> - <route type="mix" sink="usb_device input" - sources="USB Device In"/> - </routes> -</module> @@ -110,11 +110,13 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths.xml:system/etc/sound_trigger_mixer_paths.xml \ $(LOCAL_PATH)/audio/sound_trigger_mixer_paths_wcd9330.xml:system/etc/sound_trigger_mixer_paths_wcd9330.xml \ $(LOCAL_PATH)/audio/sound_trigger_platform_info.xml:system/etc/sound_trigger_platform_info.xml \ - $(LOCAL_PATH)/audio/a2dp_audio_policy_configuration.xml:/system/etc/a2dp_audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/audio_policy_volumes.xml:/system/etc/audio_policy_volumes.xml \ - $(LOCAL_PATH)/audio/default_volume_tables.xml:/system/etc/default_volume_tables.xml \ - $(LOCAL_PATH)/audio/r_submix_audio_policy_configuration.xml:/system/etc/r_submix_audio_policy_configuration.xml \ - $(LOCAL_PATH)/audio/usb_audio_policy_configuration.xml:/system/etc/usb_audio_policy_configuration.xml + +PRODUCT_COPY_FILES += \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:/system/etc/a2dp_audio_policy_configuration.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:/system/etc/audio_policy_volumes.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/default_volume_tables.xml:/system/etc/default_volume_tables.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:/system/etc/r_submix_audio_policy_configuration.xml \ + $(TOPDIR)frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:/system/etc/usb_audio_policy_configuration.xml # Camera PRODUCT_PACKAGES += \ |