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

Commit 35f7ccbe authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

Merge "Canonicalize include stack/l2cap" am: 92d66222 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1975827

Change-Id: I963ea64451244d2334c976fd39782e148fc6cd05
parents 2a6ab08e 92d66222

system/stack/l2cap/l2c_api.cc

+1 −1
Original line number Diff line number Diff line
@@ -32,11 +32,11 @@ 
#include <cstdint>

#include <string>



#include "btm_sec.h"

#include "device/include/controller.h"  // TODO Remove

#include "main/shim/shim.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2c_api.h"

#include "stack/l2cap/l2c_int.h"

system/stack/l2cap/l2c_ble.cc

+4 −4
Original line number Diff line number Diff line
@@ -28,11 +28,8 @@ 
#include <base/strings/stringprintf.h>



#include "bt_target.h"

#include "bta_hearing_aid_api.h"

#include "bta/include/bta_hearing_aid_api.h"

#include "device/include/controller.h"

#include "l2c_api.h"

#include "l2c_int.h"

#include "l2cdefs.h"

#include "main/shim/l2c_api.h"

#include "main/shim/shim.h"

#include "osi/include/allocator.h"
@@ -41,6 +38,9 @@ 
#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cdefs.h"

#include "stack/l2cap/l2c_int.h"

#include "stack_config.h"

#include "types/raw_address.h"

system/stack/l2cap/l2c_csm.cc

+2 −2
Original line number Diff line number Diff line
@@ -30,14 +30,14 @@ 


#include "bt_target.h"

#include "common/time_util.h"

#include "l2c_int.h"

#include "l2cdefs.h"

#include "main/shim/metrics_api.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "stack/btm/btm_sec.h"

#include "stack/include/acl_api.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2cdefs.h"

#include "stack/l2cap/l2c_int.h"



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

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */

system/stack/l2cap/l2c_fcr.cc

+3 −3
Original line number Diff line number Diff line
@@ -29,13 +29,13 @@ 
#include <string.h>



#include "common/time_util.h"

#include "l2c_api.h"

#include "l2c_int.h"

#include "l2cdefs.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_types.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cdefs.h"

#include "stack/l2cap/l2c_int.h"



/* Flag passed to retransmit_i_frames() when all packets should be retransmitted

 */

system/stack/l2cap/l2c_main.cc

+4 −4
Original line number Diff line number Diff line
@@ -27,15 +27,15 @@ 
#include <string.h>



#include "bt_target.h"

#include "hcimsgs.h"

#include "l2c_api.h"

#include "l2c_int.h"

#include "l2cdefs.h"

#include "hcimsgs.h"  // HCID_GET_

#include "main/shim/shim.h"

#include "osi/include/allocator.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cdefs.h"

#include "stack/l2cap/l2c_int.h"



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

/*            L O C A L    F U N C T I O N     P R O T O T Y P E S            */