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

Commit e1e01c52 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'LA.BF.1.1.3_rb1.5' of git://codeaurora.org/platform/hardware/qcom/audio into cm-13.0 

Change-Id: I5d4b7babc9dda6cc8e702b4723d92bbd0f641efd
parents 08e8bcca fc5fc5de

hal/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ ifneq ($(strip $(AUDIO_FEATURE_ENABLED_PROXY_DEVICE)),false) 
    LOCAL_CFLAGS += -DAFE_PROXY_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM)),true)

    LOCAL_CFLAGS += -DFM_ENABLED

ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM_POWER_OPT)),true)

    LOCAL_CFLAGS += -DFM_POWER_OPT

    LOCAL_SRC_FILES += audio_extn/fm.c

endif

hal/audio_extn/audio_extn.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ static struct audio_extn_module aextnmod = { 
/* Query offload playback instances count */

#define AUDIO_PARAMETER_OFFLOAD_NUM_ACTIVE "offload_num_active"



#ifndef FM_ENABLED

#ifndef FM_POWER_OPT

#define audio_extn_fm_set_parameters(adev, parms) (0)

#else

void audio_extn_fm_set_parameters(struct audio_device *adev,

hal/audio_extn/audio_extn.h

+2 −7
Original line number Diff line number Diff line
@@ -44,13 +44,8 @@ 
#define AUDIO_OUTPUT_FLAG_INCALL_MUSIC 0x8000

#endif



#ifdef FM_ENABLED

#define AUDIO_DEVICE_OUT_FM 0x80000

#define AUDIO_DEVICE_OUT_FM_TX 0x100000

#define AUDIO_SOURCE_FM_RX 9

#define AUDIO_SOURCE_FM_RX_A2DP 10

#define AUDIO_DEVICE_IN_FM_RX (AUDIO_DEVICE_BIT_IN | 0x8000)

#define AUDIO_DEVICE_IN_FM_RX_A2DP (AUDIO_DEVICE_BIT_IN | 0x10000)

#ifndef AUDIO_DEVICE_OUT_FM_TX

#define AUDIO_DEVICE_OUT_FM_TX 0x8000000

#endif

hal/audio_extn/fm.c

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <stdlib.h>

#include <cutils/str_parms.h>



#ifdef FM_ENABLED

#ifdef FM_POWER_OPT

#define AUDIO_PARAMETER_KEY_HANDLE_FM "handle_fm"

#define AUDIO_PARAMETER_KEY_FM_VOLUME "fm_volume"
@@ -284,4 +284,4 @@ void audio_extn_fm_set_parameters(struct audio_device *adev, 
exit:

    ALOGV("%s: exit", __func__);

}

#endif /* FM_ENABLED end */
 
#endif /* FM_POWER_OPT end */

policy_hal/Android.mk

+6 −2
Original line number Diff line number Diff line
@@ -47,6 +47,10 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24)),true) 
LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED_24

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_FM_POWER_OPT)),true)

LOCAL_CFLAGS += -DFM_POWER_OPT

endif



LOCAL_CFLAGS += -Wno-error -fpermissive



LOCAL_MODULE := libaudiopolicymanager