diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-01-15 07:52:02 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.cyanogenmod.com> | 2013-01-15 07:52:02 -0800 |
| commit | 21f546d8b0259380048b14d42b38243b5ddc9fe4 (patch) | |
| tree | 0b757e9c2a7365f479d969f11ecce15f1ae1e144 | |
| parent | c483bdb016422a9b9e6c56a46e65df0171132dc2 (diff) | |
| parent | 6a2d77757d46081868558749c0f963c2de7fbf55 (diff) | |
| download | frameworks_av-21f546d8b0259380048b14d42b38243b5ddc9fe4.zip frameworks_av-21f546d8b0259380048b14d42b38243b5ddc9fe4.tar.gz frameworks_av-21f546d8b0259380048b14d42b38243b5ddc9fe4.tar.bz2 | |
Merge "Make an exception for MR0_AUDIO_BLOB in loadHwModule_l" into cm-10.1
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index 4ea7443..bf94efe 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -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))) { |