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

Commit 21f546d8 authored by Daniel Hillenbrand's avatar Daniel Hillenbrand Committed by Gerrit Code Review
Browse files

Merge "Make an exception for MR0_AUDIO_BLOB in loadHwModule_l" into cm-10.1

parents c483bdb0 6a2d7775

services/audioflinger/AudioFlinger.cpp

+2 −2
Original line number Diff line number Diff line
@@ -7513,7 +7513,7 @@ audio_module_handle_t AudioFlinger::loadHwModule_l(const char *name) 
    {  // scope for auto-lock pattern

        AutoMutex lock(mHardwareLock);



#ifndef ICS_AUDIO_BLOB

#if !defined(ICS_AUDIO_BLOB) && !defined(MR0_AUDIO_BLOB)

        if (0 == mAudioHwDevs.size()) {

            mHardwareStatus = AUDIO_HW_GET_MASTER_VOLUME;

            if (NULL != dev->get_master_volume) {
@@ -7540,7 +7540,7 @@ audio_module_handle_t AudioFlinger::loadHwModule_l(const char *name) 
                    AudioHwDevice::AHWD_CAN_SET_MASTER_VOLUME);

        }



#ifndef ICS_AUDIO_BLOB

#if !defined(ICS_AUDIO_BLOB) && !defined(MR0_AUDIO_BLOB)

        mHardwareStatus = AUDIO_HW_SET_MASTER_MUTE;

        if ((NULL != dev->set_master_mute) &&

            (OK == dev->set_master_mute(dev, mMasterMute))) {