commit 01fd3fbe9be158410b983d75ebc54b8c5cd0515f
author Eric Laurent <elaurent@google.com> Mon Sep 22 18:42:28 2014 -0700
committer Eric Laurent <elaurent@google.com> Fri Sep 26 15:52:33 2014 -0700
tree 07735d67f775149447c540a7735f7179f9cedfee
parent 4920d3856ef7e8d678329d88276b5dcc78a6aa23

audio: fix audio mode transitions

Allow direct transition from IN_CALL to IN_COMMUNICATION
modes by exiting in call state when transitioning to NORMAL or
IN_COMMUNICATION modes instead of only when transitioning to NORMAL.

Bug: 17591576.
Change-Id: I2a915df0b283b311b8cbec0fa9cd8573f76d4686

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 7d5456f..c14078e 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -1327,7 +1327,7 @@
          *       Because select_devices() must be called to switch back the music
          *       playback to headset.
          */
-        if ((adev->mode == AUDIO_MODE_NORMAL) &&
+        if (((adev->mode == AUDIO_MODE_NORMAL) || (adev->mode == AUDIO_MODE_IN_COMMUNICATION)) &&
                 voice_is_in_call(adev) &&
                 output_drives_call(adev, out)) {
             ret = voice_stop_call(adev);