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

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

Merge 2cc132a7 on remote branch 

Change-Id: Ie565d247cf53485a95fef0645a5070bd35baafaf
parents 86b26cf1 2cc132a7

configs/sdm845/audio_policy_configuration.xml

+1 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 
                     <profile name="" format="AUDIO_FORMAT_PCM_FLOAT"

                              samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000,88200,96000,176400,192000"

                              channelMasks="AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6,AUDIO_CHANNEL_IN_7POINT1,AUDIO_CHANNEL_INDEX_MASK_8"/>

                </mixPort>

                <mixPort name="incall_music_uplink" role="source"

                         flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

hal/audio_hw.c

+8 −3
Original line number Diff line number Diff line
@@ -2723,7 +2723,10 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
                                 (is_single_device_type_equal(&usecase->device_list,

                                                     AUDIO_DEVICE_IN_USB_HEADSET) &&

                                 is_single_device_type_equal(&vc_usecase->device_list,

                                                        AUDIO_DEVICE_OUT_USB_HEADSET)))) {

                                                        AUDIO_DEVICE_OUT_USB_HEADSET))||

                                 (is_single_device_type_equal(&usecase->device_list,

                                                     AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET) &&

                                 is_codec_backend_out_device_type(&vc_usecase->device_list)))) {

                in_snd_device = vc_usecase->in_snd_device;

                out_snd_device = vc_usecase->out_snd_device;

            }
@@ -8758,12 +8761,14 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs) 
            struct listnode *node;

            list_for_each(node, &adev->usecase_list) {

                usecase = node_to_item(node, struct audio_usecase, list);

                if (usecase->stream.in && (usecase->type == PCM_CAPTURE) &&

                if (usecase->stream.in && (usecase->type == PCM_CAPTURE ||

                                           usecase->type == VOICE_CALL) &&

                    (!is_btsco_device(SND_DEVICE_NONE, usecase->in_snd_device))) {

                    ALOGD("BT_SCO ON, switch all in use case to it");

                    select_devices(adev, usecase->id);

                    }

                if (usecase->stream.out && (usecase->type == PCM_PLAYBACK) &&

                if (usecase->stream.out && (usecase->type == PCM_PLAYBACK ||

                                            usecase->type == VOICE_CALL) &&

                    (!is_btsco_device(usecase->out_snd_device, SND_DEVICE_NONE))) {

                     ALOGD("BT_SCO ON, switch all out use case to it");

                     select_devices(adev, usecase->id);