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

Commit 0a957d32 authored by jiabin's avatar jiabin
Browse files

Check silent mode when updating output device. 

After refactoring audio device type, the output devices will only be set
when create/release audio patch. In that case, the output devices are
empty when creating the thread. If the "ro.audio.silent" is set, it will
make master muted if the output devices are empty. To fix the issue, do
not check silent mode when the output devices are empty, but check
silent mode when output devices are updated.

Test: atest AudioHostTest with setting "ro.audio.silent"
Bug: 154037767
Change-Id: I6cb219353e541ba99ba9acebd6ce853128d963d3
parent ec660f18

services/audioflinger/Threads.cpp

+6 −0
Original line number Diff line number Diff line
@@ -3051,6 +3051,10 @@ void AudioFlinger::PlaybackThread::checkSilentMode_l() 
{

    if (!mMasterMute) {

        char value[PROPERTY_VALUE_MAX];

        if (mOutDeviceTypeAddrs.empty()) {

            ALOGD("ro.audio.silent is ignored since no output device is set");

            return;

        }

        if (isSingleDeviceType(outDeviceTypes(), AUDIO_DEVICE_OUT_REMOTE_SUBMIX)) {

            ALOGD("ro.audio.silent will be ignored for threads on AUDIO_DEVICE_OUT_REMOTE_SUBMIX");

            return;
@@ -4227,6 +4231,7 @@ status_t AudioFlinger::PlaybackThread::createAudioPatch_l(const struct audio_pat 
                         (mPatch.sinks[0].id != sinkPortId);

    mPatch = *patch;

    mOutDeviceTypeAddrs = deviceTypeAddrs;

    checkSilentMode_l();



    if (mOutput->audioHwDev->supportsAudioPatches()) {

        sp<DeviceHalInterface> hwDevice = mOutput->audioHwDev->hwDevice();
@@ -9153,6 +9158,7 @@ status_t AudioFlinger::MmapThread::createAudioPatch_l(const struct audio_patch * 
        if (isOutput()) {

            sendIoConfigEvent_l(AUDIO_OUTPUT_CONFIG_CHANGED);

            mOutDeviceTypeAddrs = sinkDeviceTypeAddrs;

            checkSilentMode_l();

        } else {

            sendIoConfigEvent_l(AUDIO_INPUT_CONFIG_CHANGED);

            mInDeviceTypeAddr = sourceDeviceTypeAddr;