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

Commit a24a3601 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 output device selection when start voice call"

parents 8db0cd37 e3ca4c80

hal/msm8916/platform.c

+0 −2
Original line number Diff line number Diff line
@@ -4026,8 +4026,6 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
                snd_device = SND_DEVICE_OUT_BT_SCO_WB;

            else

                snd_device = SND_DEVICE_OUT_BT_SCO;

        } else if (devices & AUDIO_DEVICE_OUT_ALL_A2DP) {

                snd_device = SND_DEVICE_OUT_BT_A2DP;

        } else if (devices & AUDIO_DEVICE_OUT_SPEAKER) {

                if (my_data->is_vbat_speaker) {

                    if (my_data->mono_speaker == SPKR_1)

hal/msm8974/platform.c

+0 −2
Original line number Diff line number Diff line
@@ -3861,8 +3861,6 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
                    } else

                            snd_device = SND_DEVICE_OUT_VOICE_SPEAKER;

                }

        } else if (devices & AUDIO_DEVICE_OUT_ALL_A2DP) {

            snd_device = SND_DEVICE_OUT_BT_A2DP;

        } else if (devices & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET ||

                   devices & AUDIO_DEVICE_OUT_DGTL_DOCK_HEADSET) {

            snd_device = SND_DEVICE_OUT_USB_HEADSET;

hal/voice.c

+6 −5
Original line number Diff line number Diff line
@@ -226,16 +226,17 @@ int voice_start_usecase(struct audio_device *adev, audio_usecase_t usecase_id) 
        goto error_start_voice;

    }



    uc_info->in_snd_device = SND_DEVICE_NONE;

    uc_info->out_snd_device = SND_DEVICE_NONE;



    if (audio_is_bluetooth_sco_device(uc_info->devices) && !adev->bt_sco_on) {

        ALOGE("start_call: couldn't find BT SCO, SCO is not ready");

    if ((audio_is_bluetooth_sco_device(uc_info->devices) && !adev->bt_sco_on) ||

        audio_is_a2dp_out_device(uc_info->devices)) {

        ALOGE("start_call: BT SCO is chosen but SCO is not ready, or A2DP is selected");

        adev->voice.in_call = false;

        ret = -EIO;

        goto error_start_voice;

    }



    uc_info->in_snd_device = SND_DEVICE_NONE;

    uc_info->out_snd_device = SND_DEVICE_NONE;



    list_add_tail(&adev->usecase_list, &uc_info->list);



    select_devices(adev, usecase_id);