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

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

Merge "Revert "hal: Fix voice session setup failure""

parents d33629db ca36cb1c

hal/msm8916/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -2428,7 +2428,7 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
        goto exit;

    }



    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {

    if (popcount(devices) == 2) {

        if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |

                        AUDIO_DEVICE_OUT_SPEAKER)) {

            if (my_data->external_spk_1)

hal/msm8974/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -2049,7 +2049,7 @@ snd_device_t platform_get_output_snd_device(void *platform, struct stream_out *o 
        goto exit;

    }



    if (popcount(devices) == 2 && !voice_is_in_call(adev)) {

    if (popcount(devices) == 2) {

        if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |

                        AUDIO_DEVICE_OUT_SPEAKER)) {

            if (my_data->external_spk_1)