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

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

Merge c65f2512 on remote branch 

Change-Id: I78ddeca5566db0319e35ae89c47e52db94a38648
parents 85e05190 c65f2512

configs/atoll/sound_trigger_platform_info.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--- Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.       -->

<!--- Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.       -->

<!---                                                                           -->

<!--- Redistribution and use in source and binary forms, with or without        -->

<!--- modification, are permitted provided that the following conditions are    -->
@@ -37,6 +37,7 @@ 
<!--- 0x0105: Select <lsm_usecase> based on capture device                      -->



    <common_config>

        <param implementer_version="0x0101" />

        <param max_ape_sessions="8" />

        <param enable_failure_detection="false" />

        <param support_device_switch="false" />

configs/kona/sound_trigger_platform_info.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--- Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.       -->

<!--- Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.       -->

<!---                                                                           -->

<!--- Redistribution and use in source and binary forms, with or without        -->

<!--- modification, are permitted provided that the following conditions are    -->
@@ -37,6 +37,7 @@ 
<!--- 0x0105: Select <lsm_usecase> based on capture device                      -->



    <common_config>

        <param implementer_version="0x0101" />

        <param max_ape_sessions="8" />

        <param enable_failure_detection="false" />

        <param support_device_switch="false" />

configs/lito/sound_trigger_platform_info.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="ISO-8859-1"?>

<!--- Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.       -->

<!--- Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.       -->

<!---                                                                           -->

<!--- Redistribution and use in source and binary forms, with or without        -->

<!--- modification, are permitted provided that the following conditions are    -->
@@ -37,6 +37,7 @@ 
<!--- 0x0105: Select <lsm_usecase> based on capture device                      -->



    <common_config>

        <param implementer_version="0x0101" />

        <param max_ape_sessions="8" />

        <param enable_failure_detection="false" />

        <param support_device_switch="false" />

hal/audio_extn/audio_extn.c

+3 −2
Original line number Diff line number Diff line 
/*

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

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

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -5217,7 +5217,8 @@ bool audio_extn_is_hifi_filter_enabled(struct audio_device* adev, struct stream_ 
    if (audio_extn_hifi_filter_enabled) {

        /*Restricting the feature for Tavil and WCD9375 codecs only*/

        if ((strstr(codec_variant, "WCD9385") || strstr(codec_variant, "WCD9375"))

            && (na_mode == NATIVE_AUDIO_MODE_MULTIPLE_MIX_IN_DSP) && channels <=2) {

            && (na_mode == NATIVE_AUDIO_MODE_MULTIPLE_MIX_IN_DSP || na_mode ==

                       NATIVE_AUDIO_MODE_TRUE_44_1) && channels <=2) {

            /*Upsampling 8 time should be restricited to headphones playback only */

            if (snd_device == SND_DEVICE_OUT_HEADPHONES

                || snd_device == SND_DEVICE_OUT_HEADPHONES_44_1