Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f4c02d9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Fix for recording during voice call over BT"

parents bbf04216 067b96b4

hal/audio_hw.c

+2 −1
Original line number Diff line number Diff line
@@ -611,7 +611,8 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
        if (voice_is_in_call(adev)) {

            vc_usecase = get_usecase_from_list(adev,

                                               get_voice_usecase_id_from_list(adev));

            if (vc_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) {

            if ((vc_usecase->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) ||

                (usecase->devices == AUDIO_DEVICE_IN_VOICE_CALL)) {

                in_snd_device = vc_usecase->in_snd_device;

                out_snd_device = vc_usecase->out_snd_device;

            }

hal/msm8974/platform.c

+2 −6
Original line number Diff line number Diff line
@@ -955,12 +955,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 


    ALOGV("%s: enter: out_device(%#x) in_device(%#x)",

          __func__, out_device, in_device);

    if ((mode == AUDIO_MODE_IN_CALL) ||

        voice_extn_compress_voip_is_active(adev)) {

        if (out_device == AUDIO_DEVICE_NONE) {

            ALOGE("%s: No output device set for voice call", __func__);

            goto exit;

        }

    if ((out_device != AUDIO_DEVICE_NONE) && ((mode == AUDIO_MODE_IN_CALL) ||

        voice_extn_compress_voip_is_active(adev))) {

        if ((adev->voice.tty_mode != TTY_MODE_OFF) &&

            !voice_extn_compress_voip_is_active(adev)) {

            if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE ||