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

Commit f28a5c3e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: solve compilation error after Dolby disable"

parents 28b836a4 bffd023d

configs/sdm660/sdm660.mk

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ AUDIO_FEATURE_ENABLED_HDMI_EDID := true 
AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

#AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := false

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true
@@ -38,7 +38,7 @@ AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true 
AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true

AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true

AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := false



AUDIO_FEATURE_ENABLED_DTS_EAGLE := false

BOARD_USES_SRS_TRUEMEDIA := false
@@ -179,8 +179,8 @@ audio.offload.multiaac.enable=true 


#Enable DS2, Hardbypass feature for Dolby

PRODUCT_PROPERTY_OVERRIDES += \

audio.dolby.ds2.enabled=true\

audio.dolby.ds2.hardbypass=true

audio.dolby.ds2.enabled=false\

audio.dolby.ds2.hardbypass=false



#Disable Multiple offload sesison

PRODUCT_PROPERTY_OVERRIDES += \

hal/audio_extn/audio_extn.c

+1 −1
Original line number Diff line number Diff line
@@ -758,7 +758,7 @@ static int get_active_offload_usecases(const struct audio_device *adev, 
    return ret;

}



void audio_extn_init(struct audio_device *adev)

void audio_extn_init(struct audio_device *adev __unused)

{

    aextnmod.anc_enabled = 0;

    aextnmod.aanc_enabled = 0;