commit 2ea386e3c5c69e6743b3b1b491377d003b495503
author Eric Laurent <elaurent@google.com> Tue May 22 12:02:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 22 12:02:25 2018 -0700
tree 2d6a3bcc8d0a284380c00cbfa624be803fae39f8
parent 12ec15e5b7c7f171cd3b1d3a5f9990fa6f5b4cf5
parent 8d31bc8f0eabf209e4769ed573674891a4d0a7f1

Merge changes from topic "audio-hal-vsid" into pi-dev am: 2e09fa6efd
am: 8d31bc8f0e

Change-Id: I5f950a3579b0c8a4968594863dc5ab2123570e2a

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index c55f036..b104319 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -2602,7 +2602,7 @@
             out->devices = new_dev;
 
             if (output_drives_call(adev, out)) {
-                if (!voice_is_in_call(adev)) {
+                if (!voice_is_call_state_active(adev)) {
                     if (adev->mode == AUDIO_MODE_IN_CALL) {
                         adev->current_call_output = out;
                         ret = voice_start_call(adev);

hal/voice_extn/voice_extn.c

diff --git a/hal/voice_extn/voice_extn.c b/hal/voice_extn/voice_extn.c
index c36a450..c4b8cff 100644
--- a/hal/voice_extn/voice_extn.c
+++ b/hal/voice_extn/voice_extn.c
@@ -162,7 +162,6 @@
     struct voice_session *session = NULL;
     int fd = 0;
     int ret = 0;
-    bool is_voice_sess_active = false;
 
     ALOGD("%s: enter:", __func__);
 
@@ -223,12 +222,6 @@
                           __func__, usecase_id);
                 } else {
                     session->state.current = session->state.new;
-
-                    // The flag is not reset if another voice session is active as routing/mode is
-                    // set globally instead of per session.
-                    voice_extn_is_call_state_active(adev, &is_voice_sess_active);
-                    if (!is_voice_sess_active)
-                        adev->voice.in_call = false;
                 }
                 break;