summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-11 20:13:43 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-11 20:13:43 +0000
commit7519874f9f600a39fa901d62fa530540e77e4131 (patch)
tree6c2956febd6c12887a328c63fd2bb539875ff25e
parentea5f2d654b99b67d7346252a51eb0c9f45a84930 (diff)
parent0ae0ee027b0ff5066f627f69da836b17ec24bb9a (diff)
downloadmarlin-7519874f9f600a39fa901d62fa530540e77e4131.tar.gz
Snap for 5547420 from 0ae0ee027b0ff5066f627f69da836b17ec24bb9a to qt-aml-release
Change-Id: I5b1ac009a556f6e6e79ca0b071246fc315ff288e
-rw-r--r--mixer_paths.xml5
-rw-r--r--sepolicy/bug_map1
2 files changed, 6 insertions, 0 deletions
diff --git a/mixer_paths.xml b/mixer_paths.xml
index e44f533b..ded6f935 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -886,6 +886,11 @@
<ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" />
</path>
+ <path name="voicemmode1-call usb-headphones">
+ <ctl name="AFE_PCM_RX_Voice Mixer VoiceMMode1" value="1" />
+ <ctl name="VoiceMMode1_Tx Mixer AFE_PCM_TX_MMode1" value="1" />
+ </path>
+
<path name="voicemmode2-call">
<ctl name="SLIM_0_RX_Voice Mixer VoiceMMode2" value="1" />
<ctl name="VoiceMMode2_Tx Mixer SLIM_0_TX_MMode2" value="1" />
diff --git a/sepolicy/bug_map b/sepolicy/bug_map
index df25e638..4178e871 100644
--- a/sepolicy/bug_map
+++ b/sepolicy/bug_map
@@ -5,3 +5,4 @@ hal_bluetooth_default ramdump_vendor_data_file dir 129298416
hal_health_default persist_file file 127303305
netd sysfs_pcie dir 77870037
perfd perfd capability 77924406
+vold_prepare_subdirs proc file 132093726