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

Commit c07cc54e authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 91ecf33a on remote branch 

Change-Id: If9eda3b1d67bb969079a37a49ddc62b94c486640
parents d68012a6 91ecf33a

hal/msm8916/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -1631,7 +1631,7 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
        goto exit;

    }



    if (popcount(devices) == 2) {

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

        if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |

                        AUDIO_DEVICE_OUT_SPEAKER)) {

            snd_device = SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES;

hal/msm8974/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -1653,7 +1653,7 @@ snd_device_t platform_get_output_snd_device(void *platform, audio_devices_t devi 
        goto exit;

    }



    if (popcount(devices) == 2) {

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

        if (devices == (AUDIO_DEVICE_OUT_WIRED_HEADPHONE |

                        AUDIO_DEVICE_OUT_SPEAKER)) {

            if (my_data->external_spk_1)