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

Commit de10dbae authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "L2cap: remove some l2c_int usage"

parents a44c29ff 1f193a05

system/bta/jv/bta_jv_act.cc

+0 −4
Original line number Diff line number Diff line
@@ -38,16 +38,12 @@ 
#include "bta_jv_int.h"

#include "bta_sys.h"

#include "btm_api.h"

#include "btm_int.h"

#include "device/include/controller.h"

#include "gap_api.h"

#include "l2c_api.h"

#include "osi/include/allocator.h"

#include "port_api.h"

#include "rfcdefs.h"

#include "sdp_api.h"

#include "stack/l2cap/l2c_int.h"

#include "utl.h"



#include "osi/include/osi.h"

system/main/shim/l2c_api.cc

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

#include "main/shim/helpers.h"

#include "main/shim/l2cap.h"

#include "osi/include/allocator.h"



static bluetooth::shim::legacy::L2cap shim_l2cap;

system/main/shim/l2c_api.h

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



#include "stack/include/l2c_api.h"

#include "stack/l2cap/l2c_int.h"



namespace bluetooth {

namespace shim {

system/stack/btm/btm_ble_gap.cc

+0 −7
Original line number Diff line number Diff line
@@ -47,19 +47,12 @@ 
#include "btm_ble_int.h"

#include "gatt_int.h"

#include "gattdefs.h"

#include "l2c_int.h"

#include "osi/include/log.h"

#include "common/time_util.h"



#include "main/shim/btm_api.h"

#include "main/shim/shim.h"



#define BTM_BLE_NAME_SHORT 0x01

#define BTM_BLE_NAME_CMPL 0x02



#define BTM_BLE_FILTER_TARGET_UNKNOWN 0xff

#define BTM_BLE_POLICY_UNKNOWN 0xff



#define BTM_EXT_BLE_RMT_NAME_TIMEOUT_MS (30 * 1000)

#define MIN_ADV_LENGTH 2

#define BTM_VSC_CHIP_CAPABILITY_RSP_LEN 9

system/stack/gap/gap_conn.cc

+1 −3
Original line number Diff line number Diff line
@@ -19,12 +19,10 @@ 
#include <base/strings/stringprintf.h>

#include <string.h>

#include "bt_target.h"

#include "bt_utils.h"

#include "btm_int.h"

#include "btu.h"

#include "device/include/controller.h"

#include "gap_api.h"

#include "l2c_int.h"

#include "l2c_api.h"

#include "l2cdefs.h"

#include "osi/include/fixed_queue.h"

#include "osi/include/mutex.h"