audio HAL: fix some audio mode transitions

The logic controlling the CP clock and audio path in setMode()
was incorrect for certain transitions. In particular, the sequence
 IN_CALL -> RINGTONE -> IN_COMMUNICATION -> IN_CALL would cause a
loss of call audio.

Change-Id: I4a6bcca32e6e33f965874ad2219f2728b9035e4a

1 files changed, 5 insertions, 3 deletions

diff --git a/libaudio/AudioHardware.cpp b/libaudio/AudioHardware.cpp
index c58e084..a189510 100644
--- a/libaudio/AudioHardware.cpp
+++ b/libaudio/AudioHardware.cpp
@@ -376,8 +376,10 @@ 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 (prevMode == AudioSystem::MODE_NORMAL)
+        if (modeNeedsCPActive)
         {
             if ((!mActivatedCP) && (mSecRilLibHandle) && (connectRILDIfRequired() == OK)) {
                 setCallClockSync(mRilClient, SOUND_CLOCK_START);
@@ -402,7 +404,7 @@ status_t AudioHardware::setMode(int mode)
             setVoiceVolume_l(mVoiceVol);
             mInCallAudioMode = true;
         }
-        if (mMode == AudioSystem::MODE_NORMAL && mInCallAudioMode) {
+        if (mMode != AudioSystem::MODE_IN_CALL && mInCallAudioMode) {
             setInputSource_l(mInputSource);
             if (mMixer != NULL) {
                 TRACE_DRIVER_IN(DRV_MIXER_GET)
@@ -431,7 +433,7 @@ status_t AudioHardware::setMode(int mode)
             mInCallAudioMode = false;
         }
 
-        if (mMode == AudioSystem::MODE_NORMAL) {
+        if (!modeNeedsCPActive) {
             if(mActivatedCP)
                 mActivatedCP = false;
         }