diff options
| author | madmack <alali48@gmail.com> | 2013-01-14 21:19:20 -0500 |
|---|---|---|
| committer | madmack <alali48@gmail.com> | 2013-01-14 21:19:20 -0500 |
| commit | 6a2d77757d46081868558749c0f963c2de7fbf55 (patch) | |
| tree | 409d2e569004b5839b0577f06bb566404a142320 /services/audioflinger | |
| parent | e0df2e7b19749ad40488d06bb557ce8d96ab3c37 (diff) | |
| download | frameworks_av-6a2d77757d46081868558749c0f963c2de7fbf55.zip frameworks_av-6a2d77757d46081868558749c0f963c2de7fbf55.tar.gz frameworks_av-6a2d77757d46081868558749c0f963c2de7fbf55.tar.bz2 | |
Make an exception for MR0_AUDIO_BLOB in loadHwModule_l
Without this exception samsung JB stock audio HAL crashes
Change-Id: I596e6e077f5bd4236359de48db754100e0a133e4
Diffstat (limited to 'services/audioflinger')
| -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))) { |