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

Commit 74c018f3 authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge "Re-include bta/..."

parents 32c4ef7b bf304744

system/bta/ag/bta_ag_sco.cc

+10 −9
Original line number Diff line number Diff line
@@ -22,21 +22,22 @@ 
 *

 ******************************************************************************/



#include <cstddef>

#include <base/bind.h>

#include <cstdint>



#include "bt_common.h"

#include "bta_ag_api.h"

#include "bta_ag_int.h"

#include "bta_api.h"

#include "btm_api.h"

#include "bt_target.h"  // Must be first to define build configuration

#include "bt_trace.h"   // Legacy trace logging



#include "bta/ag/bta_ag_int.h"

#include "device/include/controller.h"

#include "device/include/esco_parameters.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "stack/btm/btm_sco.h"

#include "stack/include/btu.h"

#include "utl.h"

#include "stack/include/btm_api.h"

#include "stack/include/btu.h"  // do_in_main_thread

#include "types/raw_address.h"



/* Codec negotiation timeout */

#ifndef BTA_AG_CODEC_NEGOTIATION_TIMEOUT_MS

system/bta/av/bta_av_cfg.cc

+27 −28
Original line number Diff line number Diff line
@@ -23,12 +23,11 @@ 
 *

 ******************************************************************************/



#include <stddef.h>

#include <cstdint>



#include "bt_common.h"

#include "bt_target.h"

#include "bta_api.h"

#include "bta_av_int.h"

#include "bt_target.h"  // Must be first to define build configuration



#include "bta/include/bta_av_api.h"

#include "stack/include/avrc_api.h"



#ifndef BTA_AV_RC_COMP_ID
@@ -117,7 +116,7 @@ const uint8_t bta_av_meta_caps_evt_ids_avrcp13[] = { 
#endif /* BTA_AVK_NUM_RC_EVT_IDS_AVRCP13 */



/* This configuration to be used when we are Src + TG + CT( only for abs vol) */

const tBTA_AV_CFG bta_av_cfg = {

extern const tBTA_AV_CFG bta_av_cfg = {

    BTA_AV_RC_COMP_ID, /* AVRCP Company ID */

    BTA_AV_RC_SUPF_CT, /* AVRCP controller categories */

    BTA_AV_RC_SUPF_TG, /* AVRCP target categories */
@@ -137,7 +136,7 @@ const tBTA_AV_CFG bta_av_cfg = { 


/* This configuration to be used when we are Sink + CT + TG( only for abs vol)

 */

const tBTA_AV_CFG bta_avk_cfg = {

extern const tBTA_AV_CFG bta_avk_cfg = {

    AVRC_CO_METADATA,   /* AVRCP Company ID */

    BTA_AVK_RC_SUPF_CT, /* AVRCP controller categories */

    BTA_AVK_RC_SUPF_TG, /* AVRCP target categories */
@@ -156,7 +155,7 @@ const tBTA_AV_CFG bta_avk_cfg = { 
};



/* This configuration to be used when we are using AVRCP1.3 */

const tBTA_AV_CFG bta_av_cfg_compatibility = {

extern const tBTA_AV_CFG bta_av_cfg_compatibility = {

    BTA_AV_RC_COMP_ID, /* AVRCP Company ID */

    BTA_AV_RC_SUPF_CT, /* AVRCP controller categories */

    AVRC_SUPF_TG_CAT1, /* Only support CAT1 for AVRCP1.3 */

system/bta/av/bta_av_ci.cc

+2 −7
Original line number Diff line number Diff line
@@ -25,15 +25,10 @@ 


#define LOG_TAG "bt_bta_av"



#include "bta/av/bta_av_int.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"



#include "bta_av_ci.h"

#include "bta_api.h"

#include "bta_av_int.h"

#include "bta_sys.h"



#include <string.h>



/*******************************************************************************

 *

 * Function         bta_av_ci_src_data_ready

system/bta/av/bta_av_main.cc

+10 −15
Original line number Diff line number Diff line
@@ -24,26 +24,21 @@ 


#define LOG_TAG "bt_bta_av"



#include <base/logging.h>

#include <string.h>

#include <cstdint>



#include "bt_target.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "bt_target.h"  // Must be first to define build configuration



#include "avrcp_service.h"

#include "bta_av_co.h"

#include "bta_av_int.h"

#include "bta/av/bta_av_int.h"

#include "bta/include/bta_ar_api.h"

#include "bta/include/utl.h"

#include "btif/avrcp/avrcp_service.h"

#include "btif/include/btif_av_co.h"

#include "btif/include/btif_config.h"

#include "l2c_api.h"

#include "l2cdefs.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"  // UNUSED_ATTR

#include "osi/include/properties.h"

#include "stack/include/acl_api.h"

#include "utl.h"



#include "bta_ar_api.h"



/*****************************************************************************

 * Constants and types

system/bta/av/bta_av_ssm.cc

+3 −4
Original line number Diff line number Diff line
@@ -21,11 +21,10 @@ 
 *  This is the stream state machine for the BTA advanced audio/video.

 *

 ******************************************************************************/

#include <string.h>



#include "bt_target.h"

#include "bta_av_co.h"

#include "bta_av_int.h"

#include "bt_target.h"  // Must be first to define build configuration



#include "bta/av/bta_av_int.h"

#include "osi/include/log.h"



/*****************************************************************************