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

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

Merge 58e8ec11 on remote branch 

Change-Id: I1a8f43d18eef60f1b7c2bb589f86bc45312b5963
parents 92b432f3 58e8ec11

Android.mk

+1 −1
Original line number Diff line number Diff line 
ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 msmnile $(MSMSTEPPE),$(TARGET_BOARD_PLATFORM)),)

ifneq ($(filter mpq8092 msm8960 msm8226 msm8x26 msm8610 msm8974 msm8x74 apq8084 msm8916 msm8994 msm8992 msm8909 msm8996 msm8952 msm8937 thorium msm8953 msmgold msm8998 sdm660 sdm845 sdm710 apq8098_latv qcs605 msmnile $(MSMSTEPPE) $(TRINKET),$(TARGET_BOARD_PLATFORM)),)



MY_LOCAL_PATH := $(call my-dir)

configs/msmnile/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK"/>

                </mixPort>

                <mixPort name="surround_sound" role="sink">

                <mixPort name="surround_sound" role="sink" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/>

configs/msmnile/msmnile.mk

+7 −0
Original line number Diff line number Diff line
@@ -230,6 +230,13 @@ vendor.audio.adm.buffering.ms=2 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.output.suspend.supported=true



# Enable AAudio MMAP/NOIRQ data path.

# 2 is AAUDIO_POLICY_AUTO so it will try MMAP then fallback to Legacy path.

PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2

# Allow EXCLUSIVE then fall back to SHARED.

PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2

PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000



#enable mirror-link feature

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.enable.mirrorlink=false

configs/msmnile/sound_trigger_mixer_paths_wcd9340_qrd.xml

+1 −1
Original line number Diff line number Diff line
@@ -329,7 +329,7 @@ 
        <ctl name="DMIC MUX0" value="DMIC0" />

        <ctl name="CDC_IF TX1 MUX" value="DEC1" />

        <ctl name="ADC MUX1" value="DMIC" />

        <ctl name="DMIC MUX1" value="DMIC3" />

        <ctl name="DMIC MUX1" value="DMIC2" />

        <ctl name="CDC_IF TX2 MUX" value="DEC2" />

        <ctl name="ADC MUX2" value="DMIC" />

        <ctl name="DMIC MUX2" value="DMIC5" />

configs/msmsteppe/audio_policy_configuration.xml

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
                             samplingRates="8000,16000,48000"

                             channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>

                </mixPort>

                <mixPort name="surround_sound" role="sink">

                <mixPort name="surround_sound" role="sink" maxActiveCount="2">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="8000,11025,12000,16000,22050,24000,32000,44100,48000"

                             channelMasks="AUDIO_CHANNEL_IN_MONO,AUDIO_CHANNEL_IN_STEREO,AUDIO_CHANNEL_IN_FRONT_BACK,AUDIO_CHANNEL_INDEX_MASK_3,AUDIO_CHANNEL_INDEX_MASK_4,AUDIO_CHANNEL_IN_5POINT1,AUDIO_CHANNEL_INDEX_MASK_6"/>