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

Commit ddfb6c3b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Check silent mode when updating output device." into rvc-dev am: b79d3b8d am: dc4509bc 

Change-Id: I8ae5dfb977da6c3d9d12f0b1b1da4f59d63cd93e
parents d78f60db dc4509bc

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;