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

Commit 32107ef8 authored by Chris Manton's avatar Chris Manton Committed by Gerrit Code Review
Browse files

Merge changes I14572835,Ib445933a,I842b69db,I2b8eeb2c,Iaf263d45, ... 

* changes:
  Re-include include/hardware/bt_sock
  Re-include btif/include/btif_av
  Re-include btif/include/btif_a2dp_source
  Re-include btif/include/btif_a2dp_sink
  Re-include bta/sdp/bta_sdp_int
  Re-include bta/pb/bta_pbs_int
  Re-include bta/pan/bta_pan_int
  Re-include bta/jv/bta_jv_int
  Re-include bta/include/utl
  Re-include bta/include/bta_sdp_api
  Re-include bta/include/bta_pan_co
  Re-include bta/include/bta_pan_ci
  Re-include bta/include/bta_pan_api
  Re-include bta/include/bta_op_api
  Re-include bta/include/bta_jv_co
  Re-include bta/include/bta_jv_api
  Re-include bta/include/bta_hh_co
  Re-include bta/include/bta_hh_api
  Re-include bta/include/bta_hf_client_api
  Re-include bta/include/bta_hearing_aid_api
  Re-include bta/include/bta_hd_api
  Re-include bta/include/bta_gatts_co
  Re-include bta/include/bta_gatt_queue
  Re-include bta/include/bta_gatt_api
  Re-include bta/include/bta_dm_co
  Re-include bta/include/bta_dm_ci
  Re-include bta/include/bta_dm_api
  Re-include bta/include/bta_av_co
  Re-include bta/include/bta_av_ci
  Re-include bta/include/bta_av_api
  Re-include bta/include/bta_ar_api
  Re-include bta/include/bta_api
  Re-include bta/include/bta_ag_api
  Re-include bta/hh/bta_hh_int
  Re-include bta/hf_client/bta_hf_client_at
  Re-include bta/hd/bta_hd_int
  Re-include bta/gatt/bta_gatts_int
  Re-include bta/gatt/bta_gattc_int
  Re-include bta/dm/bta_dm_int
  Re-include bta/av/bta_av_int
  Re-include bta/ar/bta_ar_int
  Re-include bta/ag/bta_ag_int
  Properly include bta/ag/bta_ag_at::size_t
  Properly include bta/gatt/database_builder
  Properly include various compilation units
parents b34973da f0116f21

system/bta/ag/bta_ag_at.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#ifndef BTA_AG_AT_H

#define BTA_AG_AT_H



#include <cstddef>

#include <cstdint>



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

system/bta/ag/bta_ag_int.h

+4 −4
Original line number Diff line number Diff line
@@ -26,10 +26,10 @@ 


#include <cstdint>



#include "bta_ag_api.h"

#include "bta_ag_at.h"

#include "bta_api.h"

#include "bta_sys.h"

#include "bta/ag/bta_ag_at.h"

#include "bta/include/bta_ag_api.h"

#include "bta/include/bta_api.h"

#include "bta/sys/bta_sys.h"



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

 *  Constants

system/bta/ag/bta_ag_main.cc

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "main/shim/dumpsys.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/btm_api.h"

#include "utl.h"



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

system/bta/ar/bta_ar.cc

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 


#include "bta_ar_api.h"

#include "bta_ar_int.h"

#include "stack/include/avct_api.h"

#include "stack/include/avrc_api.h"



/* AV control block */

tBTA_AR_CB bta_ar_cb;

system/bta/ar/bta_ar_int.h

+4 −1
Original line number Diff line number Diff line
@@ -25,7 +25,10 @@ 
#ifndef BTA_AR_INT_H

#define BTA_AR_INT_H



#include "bta_av_api.h"

#include <cstdint>



#include "bta/include/bta_av_api.h"

#include "stack/include/avdt_api.h"



#define BTA_AR_AV_MASK 0x01

#define BTA_AR_AVK_MASK 0x02