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

Commit e1aff636 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "legacy: Explicitly include osi/include/allocator" am: 37c5d4a1 am:... 

Merge "legacy: Explicitly include osi/include/allocator" am: 37c5d4a1 am: 09619106 am: 275f1390

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1812543

Change-Id: Ibf376eab5e2e3a75a20212a3c8638fe58b52f53e
parents 1da1b892 275f1390

system/bta/ag/bta_ag_sdp.cc

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 


#include "bta/ag/bta_ag_int.h"

#include "btif/include/btif_config.h"

#include "osi/include/allocator.h"

#include "stack/include/btm_api.h"

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

#include "stack/include/port_api.h"

system/bta/gatt/bta_gattc_cache.cc

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#include "bta/gatt/bta_gattc_int.h"

#include "bta/gatt/database.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/gatt_api.h"

system/bta/gatt/bta_gattc_queue.cc

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <unordered_map>

#include <unordered_set>



#include "osi/include/allocator.h"



using gatt_operation = BtaGattQueue::gatt_operation;



constexpr uint8_t GATT_READ_CHAR = 1;

system/bta/gatt/bta_gatts_act.cc

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include "bta/gatt/bta_gatts_int.h"

#include "bta/include/bta_api.h"

#include "btif/include/btif_debug_conn.h"

#include "osi/include/allocator.h"

#include "osi/include/osi.h"

#include "stack/include/gatt_api.h"

system/bta/hh/bta_hh_act.cc

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "bta/include/bta_hh_co.h"

#include "bta/sys/bta_sys.h"

#include "main/shim/dumpsys.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

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

#include "stack/include/hiddefs.h"