From af99da1f990b673a836bb60af7e9ad7234d5d69e Mon Sep 17 00:00:00 2001
From: Pawit Pornkitprasan
Date: Wed, 4 Jan 2012 20:55:54 +0700
Subject: Revert "audio HAL: fix some audio mode transitions"
This reverts commit 49cb776c1a5d056c345d90465f8006ef23d947b0.
This commit was not present for crespo gingerbread release and breaks
calls on certain modems/carriers for us (in a new way).
Change-Id: If679716844d092d18a2c4c945fd3b0b8c48136f9
---
libaudio/AudioHardware.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index 0048e40..3d1ed1e 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -385,10 +385,8 @@ status_t AudioHardware::setMode(int mode)
status = AudioHardwareBase::setMode(mode);
LOGV("setMode() : new %d, old %d", mMode, prevMode);
if (status == NO_ERROR) {
- bool modeNeedsCPActive = mMode == AudioSystem::MODE_IN_CALL ||
- mMode == AudioSystem::MODE_RINGTONE;
// activate call clock in radio when entering in call or ringtone mode
- if (modeNeedsCPActive)
+ if (prevMode == AudioSystem::MODE_NORMAL)
{
if ((!mActivatedCP) && (mSecRilLibHandle) && (connectRILDIfRequired() == OK)) {
setCallClockSync(mRilClient, SOUND_CLOCK_START);
@@ -413,7 +411,7 @@ status_t AudioHardware::setMode(int mode)
setVoiceVolume_l(mVoiceVol);
mInCallAudioMode = true;
}
- if (mMode != AudioSystem::MODE_IN_CALL && mInCallAudioMode) {
+ if (mMode == AudioSystem::MODE_NORMAL && mInCallAudioMode) {
setInputSource_l(mInputSource);
if (mMixer != NULL) {
TRACE_DRIVER_IN(DRV_MIXER_GET)
@@ -442,7 +440,7 @@ status_t AudioHardware::setMode(int mode)
mInCallAudioMode = false;
}
- if (!modeNeedsCPActive) {
+ if (mMode == AudioSystem::MODE_NORMAL) {
if(mActivatedCP)
mActivatedCP = false;
}
--
cgit v1.1