commit 0fbad3c813cdd67dcab95f998f1982b2180dc322
author Ricardo Garcia <rago@google.com> Fri Feb 20 00:36:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 20 00:36:26 2015 +0000
tree 1401cfae977d096245441ce047425e80a1db1633
parent a52b8d1f4890f0a695cfbffda106579bcc3a16b5
parent 3e91b5d11866599e8f33e63fb3b6c1d81ce1a1d2

Merge "Fix for getMicMute in AudioFlinger"

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 9ad437a..f3780a9 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -826,14 +826,20 @@
     if (ret != NO_ERROR) {
         return false;
     }
-
+    bool mute = true;
     bool state = AUDIO_MODE_INVALID;
     AutoMutex lock(mHardwareLock);
-    audio_hw_device_t *dev = mPrimaryHardwareDev->hwDevice();
     mHardwareStatus = AUDIO_HW_GET_MIC_MUTE;
-    dev->get_mic_mute(dev, &state);
+    for (size_t i = 0; i < mAudioHwDevs.size(); i++) {
+        audio_hw_device_t *dev = mAudioHwDevs.valueAt(i)->hwDevice();
+        status_t result = dev->get_mic_mute(dev, &state);
+        if (result == NO_ERROR) {
+            mute = mute && state;
+        }
+    }
     mHardwareStatus = AUDIO_HW_IDLE;
-    return state;
+
+    return mute;
 }
 
 status_t AudioFlinger::setMasterMute(bool muted)