diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-27 01:01:35 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-27 01:01:35 +0000 |
| commit | f026376639e8789d0cc10861751a51ec25e26a10 (patch) | |
| tree | 7b5273ae2e3f3f194ded33505b27ae1a655fb77d | |
| parent | d69fa9b2ded2cab0b54cd9f11bf788d86112eb73 (diff) | |
| parent | ffd4f79ac2f274e0cbdc87dcac7e2bf7bbe66616 (diff) | |
| download | redfin-f026376639e8789d0cc10861751a51ec25e26a10.tar.gz | |
Snap for 7314842 from ffd4f79ac2f274e0cbdc87dcac7e2bf7bbe66616 to sc-release
Change-Id: Ib5034176f1bfa836e3d2d82665008ed440b35cc0
| -rw-r--r-- | audio/sound_trigger_mixer_paths.xml | 12 | ||||
| -rw-r--r-- | usb/UsbGadget.h | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/audio/sound_trigger_mixer_paths.xml b/audio/sound_trigger_mixer_paths.xml index 94a9eb6..6c99e3a 100644 --- a/audio/sound_trigger_mixer_paths.xml +++ b/audio/sound_trigger_mixer_paths.xml @@ -259,15 +259,14 @@ </path> <path name="listen-ape-handset-mic"> - <ctl name="ADC1 Capture Volume" value="23" /> - <ctl name="ADC2 Capture Volume" value="23" /> + <ctl name="ADC1 Capture Volume" id="0" value="23" /> <ctl name="PRI_TDM_TX_0 Channels" value="One" /> <ctl name="Sto1 ADC MIXL BargeIn DMIC Switch" value="1" /> </path> <path name="listen-ape-handset-dmic"> - <ctl name="ADC1 Capture Volume" value="23"/> - <ctl name="ADC2 Capture Volume" value="23"/> + <ctl name="ADC1 Capture Volume" id="0" value="23"/> + <ctl name="ADC2 Capture Volume" id="1" value="23"/> <ctl name="PRI TDM TX Channel Offset" id="0" value="0"/> <ctl name="PRI TDM TX Channel Offset" id="1" value="12"/> <ctl name="PRI_TDM_TX_0 Channels" value="Two"/> @@ -276,8 +275,9 @@ </path> <path name="listen-ape-handset-tmic"> - <ctl name="ADC1 Capture Volume" value="23" /> - <ctl name="ADC2 Capture Volume" value="23" /> + <ctl name="ADC1 Capture Volume" id="0" value="23" /> + <ctl name="ADC2 Capture Volume" id="0" value="23" /> + <ctl name="ADC2 Capture Volume" id="1" value="23" /> <ctl name="PRI_TDM_TX_0 Channels" value="Three" /> </path> diff --git a/usb/UsbGadget.h b/usb/UsbGadget.h index 93c7d66..32b173f 100644 --- a/usb/UsbGadget.h +++ b/usb/UsbGadget.h @@ -66,7 +66,8 @@ using ::android::hardware::usb::gadget::V1_1::IUsbGadget; using ::std::string; constexpr char kGadgetName[] = "a600000.dwc3"; -static MonitorFfs monitorFfs(kGadgetName); +constexpr char kExtconUsbState[] = "/sys/class/extcon/extcon4/cable.0/state"; +static MonitorFfs monitorFfs(kGadgetName, kExtconUsbState); struct UsbGadget : public IUsbGadget { UsbGadget(); |