diff options
| author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2011-10-10 23:30:59 +0530 |
|---|---|---|
| committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2011-10-10 23:30:59 +0530 |
| commit | b75c846b4bf2b5d7ec07cc9d96a89e65180a13aa (patch) | |
| tree | dae2073f4487378ff28cd0b792c707ab1f677a9e | |
| parent | ce372dcaf68dce9ddef0ae4c3223c0fb515a196b (diff) | |
| download | alsa_sound-linaro_android_2.3.7.tar.gz | |
Revert "Fix a bug of AudioHardwareALSA::setVoiceVolume"linaro_android_2.3.7linaro_android_2.3.5
This reverts commit ce372dcaf68dce9ddef0ae4c3223c0fb515a196b.
| -rw-r--r-- | AudioHardwareALSA.cpp | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/AudioHardwareALSA.cpp b/AudioHardwareALSA.cpp index a7687db..cecfb4a 100644 --- a/AudioHardwareALSA.cpp +++ b/AudioHardwareALSA.cpp @@ -129,13 +129,10 @@ status_t AudioHardwareALSA::initCheck() status_t AudioHardwareALSA::setVoiceVolume(float volume) { // The voice volume is used by the VOICE_CALL audio stream. - if (mOutStream) { - // the mOutStream will set the volume of current device - return mOutStream->setVolume(volume, volume); - } else { - // return error + if (mMixer) + return mMixer->setVolume(AudioSystem::DEVICE_OUT_EARPIECE, volume, volume); + else return INVALID_OPERATION; - } } status_t AudioHardwareALSA::setMasterVolume(float volume) |