summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJef Oliver <jgoliver@jeago.com>2012-08-27 23:56:00 -0700
committerJef Oliver <jgoliver@jeago.com>2012-08-27 23:56:00 -0700
commitcb2e5b898d2ace7485d5c518efbf5898ccbd3cd4 (patch)
treeafeea2bc3830acce57489650b581ad05d029910f
parent1ab9ebe5a6ccf6457ebdbfa55226e4b1c1c9c22c (diff)
parentf0750c9e5531210fb790ab319d979346ca40d792 (diff)
downloadandroid_hardware_qcom_media-cm-9.1.0.tar.gz
android_hardware_qcom_media-cm-9.1.0.tar.bz2
android_hardware_qcom_media-cm-9.1.0.zip
Merge ICS HEADcm-9.1.0
-rw-r--r--audio/msm7x27a/AudioHardware.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/audio/msm7x27a/AudioHardware.cpp b/audio/msm7x27a/AudioHardware.cpp
index 3715f824..588468dc 100644
--- a/audio/msm7x27a/AudioHardware.cpp
+++ b/audio/msm7x27a/AudioHardware.cpp
@@ -154,6 +154,7 @@ AudioHardware::AudioHardware() :
CHECK_FOR(FM_DIGITAL_BT_A2DP_HEADSET);
CHECK_FOR(FM_ANALOG_STEREO_HEADSET);
CHECK_FOR(FM_ANALOG_STEREO_HEADSET_CODEC);
+ CHECK_FOR(NO_MIC_HEADSET);
#undef CHECK_FOR
}
}
@@ -1437,7 +1438,11 @@ status_t AudioHardware::doRouting(AudioStreamInMSM72xx *input)
LOGI("Routing audio to Handset\n");
new_snd_device = SND_DEVICE_HANDSET;
new_post_proc_feature_mask = (ADRC_ENABLE | EQ_ENABLE | RX_IIR_ENABLE | MBADRC_ENABLE);
- }
+ } else if ((outputDevices & AudioSystem::DEVICE_OUT_WIRED_HEADPHONE)) {
+ LOGI("Routing audio to No microphone Wired Headset (%d,%x)\n", mMode, outputDevices);
+ new_snd_device = SND_DEVICE_NO_MIC_HEADSET;
+ new_post_proc_feature_mask = (ADRC_ENABLE | EQ_ENABLE | RX_IIR_ENABLE | MBADRC_ENABLE);
+ }
}
if (mDualMicEnabled && mMode == AudioSystem::MODE_IN_CALL) {