diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-01-04 20:55:54 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-01-21 22:33:41 +0700 |
| commit | 3254f54a641f7a11f6a19b6d770e1aedd5b28ca5 (patch) | |
| tree | 7e0c5413f2194a281a4e7f9064d6adc4e51a1573 | |
| parent | 3b1679e59ff4ae5d457c688e49332163e0e61263 (diff) | |
| download | device_samsung_aries-common-3254f54a641f7a11f6a19b6d770e1aedd5b28ca5.zip device_samsung_aries-common-3254f54a641f7a11f6a19b6d770e1aedd5b28ca5.tar.gz device_samsung_aries-common-3254f54a641f7a11f6a19b6d770e1aedd5b28ca5.tar.bz2 | |
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
| -rw-r--r-- | libaudio/AudioHardware.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp index 771fa5e..24f1202 100644 --- a/libaudio/AudioHardware.cpp +++ b/libaudio/AudioHardware.cpp @@ -371,10 +371,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); @@ -399,7 +397,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) @@ -428,7 +426,7 @@ status_t AudioHardware::setMode(int mode) mInCallAudioMode = false; } - if (!modeNeedsCPActive) { + if (mMode == AudioSystem::MODE_NORMAL) { if(mActivatedCP) mActivatedCP = false; } |