commit 2f8d367336ab740dfbd57624b0c3c0f2ab835508
author madmack <alali48@gmail.com> Mon Jan 14 21:19:20 2013 -0500
committer Dorian Snyder <dastin1015@gmail.com> Sat Mar 02 22:28:07 2013 -0800
tree 77e5da52830121119bcb9b0796f8f50c1e48c0a3
parent 0e69fea7806056e9e6bd5bdd9da95710d74f5672

Make an exception for MR0_AUDIO_BLOB in loadHwModule_l

Without this exception samsung JB stock audio HAL crashes

Change-Id: I596e6e077f5bd4236359de48db754100e0a133e4

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index a1d8138..e4c055a 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -7543,7 +7543,7 @@
     {  // 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) {
@@ -7570,7 +7570,7 @@
                     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))) {