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

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

Merge af30f010 on remote branch 

Change-Id: Ic264317336ccafd9d4a1a9d67111f121cf49053a
parents b4209b45 af30f010

configs/holi/audio_platform_info.xml

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

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

<!-- Copyright (c) 2014, 2016-2021, 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 -->
@@ -102,7 +102,7 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="42"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="41"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />

configs/holi/audio_platform_info_intcodec.xml

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

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

<!-- Copyright (c) 2014, 2016-2021, 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 -->
@@ -82,7 +82,7 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="42"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="41"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />

configs/holi/audio_platform_info_qrd.xml

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

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

<!-- Copyright (c) 2014, 2016-2021, 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 -->
@@ -101,7 +101,7 @@ 
        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="33"/>

        <usecase name="USECASE_AUDIO_PLAYBACK_AFE_PROXY" type="out" id="5"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY" type="in" id="6"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="42"/>

        <usecase name="USECASE_AUDIO_RECORD_AFE_PROXY2" type="in" id="41"/>

        <usecase name="USECASE_AUDIO_RECORD_LOW_LATENCY" type="in" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_ULL" type="out" id="13" />

        <usecase name="USECASE_AUDIO_PLAYBACK_SILENCE" type="out" id="23" />

hal/acdb.h

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

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

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

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -41,7 +41,7 @@ enum { 


struct mixer;

/* Audio calibration related functions */

typedef void (*acdb_deallocate_t)();

typedef void (*acdb_deallocate_t)(void);

typedef int  (*acdb_init_t)();

typedef int  (*acdb_init_v2_t)(const char *, char *, int);

typedef int  (*acdb_init_v3_t)(const char *, char *, struct listnode *);

hal/audio_extn/a2dp.c

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ 
static void *vndk_fwk_lib_handle = NULL;

static int is_running_with_enhanced_fwk = UNINITIALIZED;



typedef int (*vndk_fwk_isVendorEnhancedFwk_t)();

typedef int (*vndk_fwk_isVendorEnhancedFwk_t)(void);

static vndk_fwk_isVendorEnhancedFwk_t vndk_fwk_isVendorEnhancedFwk;



/*