summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMisael Lopez Cruz <misael.lopez@ti.com>2013-11-11 16:55:34 -0600
committerMisael Lopez Cruz <misael.lopez@ti.com>2013-11-11 18:09:59 -0600
commitca99e510fdc0e704f9f0d1d9a6b29f9530c99def (patch)
treec58476efde1e13a0d4eb62a91237c3a738be7205
parent861c79838ff3b85ac4ab700d9e1728d458327429 (diff)
downloadcommon-open-ca99e510fdc0e704f9f0d1d9a6b29f9530c99def.tar.gz
audio: policy: Don't force volume to max for BT SCO
Do not force the volume to max for bluetooth SCO since now the roles are inverted and the Android device is on the headset side. Change-Id: Idbf0c0e29a57cb21ff52fe593629de5205887ae3 Signed-off-by: Misael Lopez Cruz <misael.lopez@ti.com>
-rw-r--r--audio/policy/multizone/AudioPolicyManager.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/audio/policy/multizone/AudioPolicyManager.cpp b/audio/policy/multizone/AudioPolicyManager.cpp
index 4ad097f..b5de6f3 100644
--- a/audio/policy/multizone/AudioPolicyManager.cpp
+++ b/audio/policy/multizone/AudioPolicyManager.cpp
@@ -2783,15 +2783,7 @@ status_t AudioPolicyManager::setStreamVolume(int stream,
if (stream == AudioSystem::VOICE_CALL ||
stream == AudioSystem::BLUETOOTH_SCO) {
- // Force voice volume to max for bluetooth SCO as volume is managed by
- // the headset
- float voiceVolume;
- if (stream == AudioSystem::VOICE_CALL) {
- voiceVolume = (float)index/(float)mStreams[stream].mIndexMax;
- } else {
- voiceVolume = 1.0;
- }
-
+ float voiceVolume = (float)index/(float)mStreams[stream].mIndexMax;
if (voiceVolume != mLastVoiceVolume && output == mPrimaryOutput) {
mpClientInterface->setVoiceVolume(voiceVolume, delayMs);
mLastVoiceVolume = voiceVolume;