| commit | 31599680422f82164ce784cae7b0b2d2639aa92d | [log] [tgz] |
|---|---|---|
| author | Alistair Delva <adelva@google.com> | Mon Jun 15 21:46:31 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Jun 15 21:46:31 2020 +0000 |
| tree | ef2e1d505c933d8efc2721f408eac6c9bbf633e9 | |
| parent | d3b26ba98ff91c8bc3078d018f8d78da5ddf4169 [diff] | |
| parent | fd7bfa1fa7e894acae9fdad0acd4591835d4c594 [diff] |
Merge changes I44fdecfb,I1f2081e4 am: fd7bfa1fa7 Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1324657 Change-Id: Idacf484c09cad4e4ebfb1142f2c8e0f4d4cf0a52
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 13eb468..805e2cd 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c
@@ -40,7 +40,7 @@ #include <tinyalsa/asoundlib.h> #define PCM_CARD 0 -#define PCM_DEVICE 1 +#define PCM_DEVICE 0 #define OUT_PERIOD_MS 15
diff --git a/qcom/init.qcom.rc b/qcom/init.qcom.rc index 4319569..ba4f24c 100644 --- a/qcom/init.qcom.rc +++ b/qcom/init.qcom.rc
@@ -23,6 +23,7 @@ start pd_mapper exec - root -- /system/bin/sleep 1 exec - system audio -- /system/bin/tinymix "QUAT_MI2S_RX Audio Mixer MultiMedia1" 1 + exec - system audio -- /system/bin/tinymix "QUAT_MI2S_RX Audio Mixer MultiMedia2" 1 exec - system audio -- /system/bin/tinymix "SLIM RX0 MUX" AIF1_PB exec - system audio -- /system/bin/tinymix "SLIM RX0 MUX" ZERO exec - system audio -- /system/bin/tinymix "SLIM RX1 MUX" ZERO