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

Commit 13686d96 authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge changes I026085cc,I7b090528,I0223c420,I3884a9b3 

* changes:
  Re-include bta/av/bta_av_api.cc
  Re-include bta/av/bta_av_act.cc
  Re-include bta/av/bta_av_aact.cc
  Re-include bta/ar/bta_ar.cc
parents 24ec1c59 b0efde16

system/bta/ar/bta_ar.cc

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

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



#include <string.h>

#include <cstdint>



#include "bta_ar_api.h"

#include "bta_ar_int.h"

#include "bta/ar/bta_ar_int.h"

#include "bta/sys/bta_sys.h"

#include "stack/include/avct_api.h"

#include "stack/include/avrc_api.h"

system/bta/av/bta_av_aact.cc

+10 −12
Original line number Diff line number Diff line
@@ -26,32 +26,30 @@ 


#define LOG_TAG "bt_bta_av"



#include "bt_target.h"



#include <base/logging.h>

#include <base/strings/stringprintf.h>

#include <string.h>

#include <cstdint>

#include <cstring>

#include <vector>



#include "a2dp_sbc.h"

#include "avdt_api.h"

#include "avrcp_service.h"

#include "bta_ar_api.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 "bta/include/bta_ar_api.h"

#include "bta/include/bta_av_co.h"

#include "btif/avrcp/avrcp_service.h"

#include "btif/include/btif_av_co.h"

#include "btif/include/btif_config.h"

#include "btif/include/btif_storage.h"

#include "device/include/interop.h"

#include "l2c_api.h"

#include "l2cdefs.h"

#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "osi/include/properties.h"

#include "stack/include/a2dp_sbc.h"

#include "stack/include/acl_api.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_client_interface.h"

#include "utl.h"

#include "stack/include/l2c_api.h"



namespace {

system/bta/av/bta_av_act.cc

+12 −16
Original line number Diff line number Diff line
@@ -25,25 +25,21 @@ 


#define LOG_TAG "bt_bta_av"



#include "bt_target.h"



#include <base/logging.h>

#include <string.h>



#include "avdt_api.h"

#include "avrcp_service.h"

#include "bta_av_api.h"

#include "bta_av_int.h"

#include "l2c_api.h"

#include "log/log.h"

#include "osi/include/list.h"

#include <cstdint>



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



#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 "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.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"

#include "stack/include/l2c_api.h"

#include "types/raw_address.h"



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

 *  Constants

system/bta/av/bta_av_api.cc

+2 −10
Original line number Diff line number Diff line
@@ -26,17 +26,9 @@ 


#define LOG_TAG "bt_bta_av"



#include <base/logging.h>



#include "bt_target.h"



#include <string.h>

#include "bt_common.h"

#include "bta_api.h"

#include "bta_av_api.h"

#include "bta_av_int.h"

#include "bta_sys.h"

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



#include "bta/av/bta_av_int.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"