summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMykhailo Sopiha2019-09-18 06:44:33 -0500
committerPraneeth Bajjuri2019-09-19 08:06:12 -0500
commit78196f623174503b6fa094a8a0aa9ce901aaf4dd (patch)
tree02ee99130d22f7960cd8e86a0b85f9e8084438fa
parentf6c11bd7d93cb97ca61895b3b7d951dc0d8e3216 (diff)
downloaddevice-ti-beagle-x15-d-android10-core-release.tar.gz
device-ti-beagle-x15-d-android10-core-release.tar.xz
device-ti-beagle-x15-d-android10-core-release.zip
Fix audio crash loopd-android10-core-release
This commit fixes audio crash loop and allows board to boot to UI by adding audio policy files. Change-Id: I62792bc52245d214b122c475ad2b3f1e635983cc Signed-off-by: Mykhailo Sopiha <mykhailo.sopiha@linaro.org>
-rw-r--r--audio_policy_configuration.xml80
-rw-r--r--device.mk3
2 files changed, 82 insertions, 1 deletions
diff --git a/audio_policy_configuration.xml b/audio_policy_configuration.xml
new file mode 100644
index 0000000..3fc971b
--- /dev/null
+++ b/audio_policy_configuration.xml
@@ -0,0 +1,80 @@
1<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2<!-- Copyright (C) 2019 The Android Open Source Project
3
4 Licensed under the Apache License, Version 2.0 (the "License");
5 you may not use this file except in compliance with the License.
6 You may obtain a copy of the License at
7
8 http://www.apache.org/licenses/LICENSE-2.0
9
10 Unless required by applicable law or agreed to in writing, software
11 distributed under the License is distributed on an "AS IS" BASIS,
12 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13 See the License for the specific language governing permissions and
14 limitations under the License.
15-->
16
17<audioPolicyConfiguration version="1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
18
19 <globalConfiguration speaker_drc_enabled="false"/>
20
21 <modules>
22 <!-- Primary Audio HAL -->
23 <module name="primary" halVersion="2.0">
24 <attachedDevices>
25 <item>Speaker</item>
26 <item>Built-In Mic</item>
27 </attachedDevices>
28 <defaultOutputDevice>Speaker</defaultOutputDevice>
29 <mixPorts>
30 <mixPort name="primary output" role="source" flags="AUDIO_OUTPUT_FLAG_PRIMARY">
31 <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
32 samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
33 </mixPort>
34 <mixPort name="primary input" role="sink">
35 <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
36 samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"
37 channelMasks="AUDIO_CHANNEL_IN_MONO"/>
38 </mixPort>
39 </mixPorts>
40 <devicePorts>
41 <!-- Output devices declaration, i.e. Sink DEVICE PORT -->
42 <devicePort tagName="Speaker" role="sink" type="AUDIO_DEVICE_OUT_SPEAKER">
43 </devicePort>
44 <devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
45 </devicePort>
46 <devicePort tagName="Built-In Mic" type="AUDIO_DEVICE_IN_BUILTIN_MIC" role="source">
47 </devicePort>
48 <devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
49 </devicePort>
50 </devicePorts>
51 <!-- route declaration, i.e. list all available sources for a given sink -->
52 <routes>
53 <route type="mix" sink="Speaker"
54 sources="primary output"/>
55 <route type="mix" sink="Wired Headset"
56 sources="primary output"/>
57 <route type="mix" sink="Wired Headphones"
58 sources="primary output"/>
59 <route type="mix" sink="primary input"
60 sources="Built-In Mic,Wired Headset Mic"/>
61 </routes>
62 </module>
63
64 <!-- Usb Audio HAL -->
65 <xi:include href="usb_audio_policy_configuration.xml"/>
66
67 <!-- Remote Submix Audio HAL -->
68 <xi:include href="r_submix_audio_policy_configuration.xml"/>
69
70 </modules>
71 <!-- End of Modules section -->
72
73 <!-- Volume section -->
74
75 <xi:include href="audio_policy_volumes.xml"/>
76 <xi:include href="default_volume_tables.xml"/>
77
78 <!-- End of Volume section -->
79
80</audioPolicyConfiguration>
diff --git a/device.mk b/device.mk
index ee2b96a..15c784f 100644
--- a/device.mk
+++ b/device.mk
@@ -95,13 +95,14 @@ PRODUCT_PACKAGES += \
95# Audio policy configuration 95# Audio policy configuration
96USE_XML_AUDIO_POLICY_CONF := 1 96USE_XML_AUDIO_POLICY_CONF := 1
97PRODUCT_COPY_FILES += \ 97PRODUCT_COPY_FILES += \
98 device/ti/beagle_x15/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
98 frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ 99 frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
100 frameworks/av/services/audiopolicy/config/a2dp_in_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_in_audio_policy_configuration.xml \
99 frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ 101 frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
100 frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ 102 frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \
101 frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ 103 frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
102 frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ 104 frameworks/av/services/audiopolicy/config/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \
103 105
104
105# Memtrack 106# Memtrack
106PRODUCT_PACKAGES += \ 107PRODUCT_PACKAGES += \
107 android.hardware.memtrack@1.0-impl \ 108 android.hardware.memtrack@1.0-impl \