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

Commit 82b1db67 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Promotion of audio-userspace.lnx.2.1.c1-00008. 

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1068704   Id5af2ee3d0b4a4ebe39f29e395ecad396b98f924   titanium: audio: set DMIC2 for secondary mic on QRD 8953
1066651   I10026d3d9147e45d3ed2b93160922bc3bb4bc2d0   audiopolicy: Avoid spurious routing in APM::stopSource

Change-Id: I815a5bcd511c27f2b56d039a439242d4c468340b
CRs-Fixed: 1068704, 1066651
parents 9becdd92 79c93612

configs/msm8953/mixer_paths_qrd_sku3.xml

+3 −3
Original line number Diff line number Diff line
@@ -2099,7 +2099,7 @@ 
        <ctl name="DMIC MUX7" value="DMIC0" />

        <ctl name="SLIM TX8 MUX" value="DEC8" />

        <ctl name="ADC MUX8" value="DMIC" />

        <ctl name="DMIC MUX8" value="DMIC1" />

        <ctl name="DMIC MUX8" value="DMIC2" />

        <ctl name="SLIM_0_TX Channels" value="Two" />

    </path>
@@ -2111,7 +2111,7 @@ 
        <ctl name="DMIC MUX7" value="DMIC0" />

        <ctl name="SLIM TX8 MUX" value="DEC8" />

        <ctl name="ADC MUX8" value="DMIC" />

        <ctl name="DMIC MUX8" value="DMIC1" />

        <ctl name="DMIC MUX8" value="DMIC2" />

        <ctl name="SLIM_0_TX Channels" value="Two" />

    </path>
@@ -2158,7 +2158,7 @@ 
        <ctl name="DMIC MUX7" value="DMIC0" />

        <ctl name="SLIM TX8 MUX" value="DEC8" />

        <ctl name="ADC MUX8" value="DMIC" />

        <ctl name="DMIC MUX8" value="DMIC1" />

        <ctl name="DMIC MUX8" value="DMIC2" />

    </path>



    <path name="dmic-broadside">

policy_hal/AudioPolicyManager.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1072,6 +1072,7 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe 
                        outputDesc->sharesHwModuleWith(desc) &&

                        (newDevice != desc->device())) {

                        audio_devices_t dev = getNewOutputDevice(mOutputs.valueFor(curOutput), false /*fromCache*/);

                        bool force = desc->device() != dev;

                        uint32_t delayMs;

                        if (dev == prevDevice) {

                            delayMs = 0;
@@ -1080,7 +1081,7 @@ status_t AudioPolicyManagerCustom::stopSource(sp<AudioOutputDescriptor> outputDe 
                        }

                        setOutputDevice(desc,

                                    dev,

                                    true,

                                    force,

                                    delayMs);

                }

            }