Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99a37c8f authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 7314842 from ffd4f79a to sc-v2-release 

Change-Id: I080176971018455a31acfb8d09f0e666bed499c4
parents 0848d256 ffd4f79a

audio/sound_trigger_mixer_paths.xml

+6 −6
Original line number Diff line number Diff line
@@ -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>

usb/UsbGadget.h

+2 −1
Original line number Diff line number Diff line
@@ -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();