summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2016-10-27 12:45:29 -0700
committergitbuildkicker <android-build@google.com>2016-10-28 11:14:49 -0700
commit3ccd4c463f56adf1db7c0db8a9a781232460a0b8 (patch)
tree50207be5e1ddb045d4145b174215e9385226062c
parente1750657f2d2e6d4dba0f21f407c348bbc43b3d1 (diff)
downloadshamu-nougat-mr1.4-release.tar.gz
audio: fix headset + speaker pathandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r54android-7.1.1_r53android-7.1.1_r51android-7.1.1_r49android-7.1.1_r47android-7.1.1_r46android-7.1.1_r44android-7.1.1_r43android-7.1.1_r41android-7.1.1_r4android-7.1.1_r39android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1nougat-mr1.8-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-cts-release
commit 3112ad5d did not include modifications for combo paths (speaker + headset) causing loss of audio over speaker when playing over both speaker and headset simultaneously. Bug: 32464208 Change-Id: I6525318ceb5a21aba16deb3e7fe30dbb3c0a7908 (cherry picked from commit 161ffb5fef229f331f212c0b76b133f1f2060658)
-rw-r--r--mixer_paths.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/mixer_paths.xml b/mixer_paths.xml
index 7c5d02eb..5f84e1c4 100644
--- a/mixer_paths.xml
+++ b/mixer_paths.xml
@@ -352,6 +352,8 @@
<path name="deep-buffer-playback speaker-and-headphones">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia1" value="1" />
+ <ctl name="BOOST_STUB Right Mixer right MM_DL1" value="1" />
+ <ctl name="BOOST_STUB Left Mixer left MM_DL1" value="1" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia1" value="1" />
</path>
@@ -401,6 +403,8 @@
<path name="low-latency-playback speaker-and-headphones">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia5" value="1" />
+ <ctl name="BOOST_STUB Right Mixer right MM_DL5" value="1" />
+ <ctl name="BOOST_STUB Left Mixer left MM_DL5" value="1" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia5" value="1" />
</path>
@@ -438,6 +442,8 @@
<path name="compress-offload-playback speaker-and-headphones">
<ctl name="QUAT_MI2S_RX Audio Mixer MultiMedia4" value="1" />
+ <ctl name="BOOST_STUB Right Mixer right MM_DL4" value="1" />
+ <ctl name="BOOST_STUB Left Mixer left MM_DL4" value="1" />
<ctl name="SLIMBUS_0_RX Audio Mixer MultiMedia4" value="1" />
</path>