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

Commit 671437a3 authored by Scott Mertz's avatar Scott Mertz
Browse files

Merge tag 'LA.BF64.1.2.1.c1-02410-8x94.0' into cm-12.1-caf-8994 

"LA.BF64.1.2.1.c1-02410-8x94.0"
parents a31c0c79 05772c18

hal/audio_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -779,6 +779,8 @@ static void check_and_route_capture_usecases(struct audio_device *adev, 
        if (usecase->type != PCM_PLAYBACK &&

                usecase != uc_info &&

                usecase->in_snd_device != snd_device &&

                ((uc_info->devices & AUDIO_DEVICE_OUT_ALL_CODEC_BACKEND) &&

                ((usecase->devices & ~AUDIO_DEVICE_BIT_IN) & AUDIO_DEVICE_IN_ALL_CODEC_BACKEND)) &&

                (usecase->id != USECASE_AUDIO_SPKR_CALIB_TX)) {

            ALOGV("%s: Usecase (%s) is active on (%s) - disabling ..",

                  __func__, use_case_table[usecase->id],

hal/msm8916/platform.c

+1 −1
Original line number Diff line number Diff line
@@ -1573,7 +1573,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/msm8916/platform.h

+10 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -41,6 +41,15 @@ enum { 
    (AUDIO_DEVICE_OUT_EARPIECE | AUDIO_DEVICE_OUT_SPEAKER | \

     AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE)



/*

 * Below are the input devices for which back end is same, SLIMBUS_0_TX.

 * All these devices are handled by the internal HW codec. We can

 * enable any one of these devices at any time

 */

#define AUDIO_DEVICE_IN_ALL_CODEC_BACKEND \

    (AUDIO_DEVICE_IN_BUILTIN_MIC | AUDIO_DEVICE_IN_BACK_MIC | \

     AUDIO_DEVICE_IN_WIRED_HEADSET | AUDIO_DEVICE_IN_VOICE_CALL) & ~AUDIO_DEVICE_BIT_IN



/* Sound devices specific to the platform

 * The DEVICE_OUT_* and DEVICE_IN_* should be mapped to these sound

 * devices to enable corresponding mixer paths

hal/msm8960/platform.h

+10 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013, 2015 The Linux Foundation. All rights reserved.

 * Not a contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -35,6 +35,15 @@ enum { 
    (AUDIO_DEVICE_OUT_EARPIECE | AUDIO_DEVICE_OUT_SPEAKER | \

     AUDIO_DEVICE_OUT_WIRED_HEADSET | AUDIO_DEVICE_OUT_WIRED_HEADPHONE)



/*

 * Below are the input devices for which back end is same, SLIMBUS_0_TX.

 * All these devices are handled by the internal HW codec. We can

 * enable any one of these devices at any time

 */

#define AUDIO_DEVICE_IN_ALL_CODEC_BACKEND \

    (AUDIO_DEVICE_IN_BUILTIN_MIC | AUDIO_DEVICE_IN_BACK_MIC | \

     AUDIO_DEVICE_IN_WIRED_HEADSET | AUDIO_DEVICE_IN_VOICE_CALL) & ~AUDIO_DEVICE_BIT_IN



/* Sound devices specific to the platform

 * The DEVICE_OUT_* and DEVICE_IN_* should be mapped to these sound

 * devices to enable corresponding mixer paths

hal/msm8974/platform.c

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