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

Commit 1afdd3a9 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge changes I496d968e,I87a20a86 into main 

* changes:
  Reland: Use one definition for Octet16
  Remove unused ACL includes
parents 4ac81664 9822a8bd

system/bta/ag/bta_ag_cfg.cc

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "device/include/esco_parameters.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"

#include "stack/include/bt_types.h"



#ifndef BTA_AG_CIND_INFO

#define BTA_AG_CIND_INFO                                                       \

system/bta/dm/bta_dm_main.cc

+1 −2
Original line number Diff line number Diff line
@@ -26,15 +26,14 @@ 


#include "bt_trace.h"

#include "bta/dm/bta_dm_disc.h"

#include "bta/dm/bta_dm_sec_int.h"

#include "bta/dm/bta_dm_gatt_client.h"

#include "bta/dm/bta_dm_int.h"

#include "bta/dm/bta_dm_sec_int.h"

#include "gd/common/circular_buffer.h"

#include "gd/common/strings.h"

#include "main/shim/dumpsys.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"



tBTA_DM_ACL_CB bta_dm_acl_cb;

tBTA_DM_CB bta_dm_cb;

system/bta/gatt/bta_gatts_int.h

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

#include "bta/sys/bta_sys.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/gatt_api.h"

#include "types/bluetooth/uuid.h"

system/bta/gatt/database.cc

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <sstream>



#include "bt_trace.h"

#include "bt_types.h"

#include "stack/crypto_toolbox/crypto_toolbox.h"

#include "stack/include/gattdefs.h"

#include "types/bluetooth/uuid.h"

system/bta/gatt/database.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <string>

#include <vector>



#include "stack/include/bt_types.h" /* for Octet16 */

#include "stack/include/bt_octets.h"

#include "types/bluetooth/uuid.h"



namespace gatt {