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

Commit 4ff40ccb authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "DO NOT MERGE: Merge Oreo MR1 into master"

parents 63aebf86 19aff01a

hal/Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ ifeq ($(strip $(AUDIO_FEATURE_ENABLED_SND_MONITOR)), true) 
    LOCAL_SRC_FILES += audio_extn/sndmonitor.c

endif



LOCAL_HEADER_LIBRARIES += libhardware_headers



LOCAL_MODULE := audio.primary.$(TARGET_BOARD_PLATFORM)



LOCAL_MODULE_RELATIVE_PATH := hw

hal/acdb.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
//#define LOG_NDEBUG 0

#define LOG_NDDEBUG 0



#include <errno.h>

#include <stdlib.h>

#include <stdbool.h>

#include <dlfcn.h>

hal/audio_extn/audio_extn.c

+4 −0
Original line number Diff line number Diff line
@@ -118,6 +118,8 @@ int audio_extn_perf_lock_init(void) 
                                                       "perf_lock_acq");

            if (perf_lock_acq == NULL) {

                ALOGE("%s: Perf lock Acquire NULL", __func__);

                dlclose(qcopt_handle);

                qcopt_handle = NULL;

                ret = -EINVAL;

                goto err;

            }
@@ -125,6 +127,8 @@ int audio_extn_perf_lock_init(void) 
                                                       "perf_lock_rel");

            if (perf_lock_rel == NULL) {

                ALOGE("%s: Perf lock Release NULL", __func__);

                dlclose(qcopt_handle);

                qcopt_handle = NULL;

                ret = -EINVAL;

                goto err;

            }

hal/audio_extn/hfp.c

+6 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <stdlib.h>

#include <cutils/str_parms.h>

#include "audio_extn/tfa_98xx.h"

#include "audio_extn.h"



#define AUDIO_PARAMETER_HFP_ENABLE            "hfp_enable"

#define AUDIO_PARAMETER_HFP_SET_SAMPLING_RATE "hfp_set_sampling_rate"
@@ -247,6 +248,11 @@ static int32_t start_hfp(struct audio_device *adev, 
    int32_t pcm_dev_rx_id, pcm_dev_tx_id, pcm_dev_asm_rx_id, pcm_dev_asm_tx_id;



    ALOGD("%s: enter", __func__);



    if (adev->enable_hfp == true) {

        ALOGD("%s: HFP is already active!\n", __func__);

        return 0;

    }

    adev->enable_hfp = true;

    platform_set_mic_mute(adev->platform, false);

hal/audio_extn/hwdep_cal.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <dlfcn.h>

#include <fcntl.h>

#include <sys/ioctl.h>

#include <unistd.h>

#include <cutils/log.h>

#include <audio_hw.h>

#include "audio_extn.h"