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

Commit bd40126d authored by Shiv Maliyappanahalli's avatar Shiv Maliyappanahalli
Browse files

Revert "hal: Fix voice session setup failure" 

Camera click tones are not playing while in voice calls and headset
is connected since get_output_devices doesnt return a valid device.
Fix by returning combo device speaker-and-headset when in voice call.

The original issue reported in CR859796, seem to customer specific,
as on internal platforms, there are no usecases such as
"volte-call speaker-and-headset".

This reverts commit 62d96d50.

Change-Id: Ic8146d8ed5ab7312fa40242c5fda00996a27c083
parent 7285d6ff

hal/msm8916/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -2196,7 +2196,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
@@ -2154,7 +2154,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)