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

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

stack::l2cap Separate module lifecyle from client API am: 1668dc0a am: 50bf00f8 

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



Change-Id: If91e44e5bd56036acf0ebf1feb860ce3dece7ac1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d55c8cba 50bf00f8

system/btif/src/stack_manager.cc

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#include "device/include/device_iot_config.h"

#include "internal_include/bt_target.h"

#include "stack/include/gatt_api.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cap_module.h"

#include "stack/include/port_api.h"

#include "stack/sdp/sdpint.h"

#if (BNEP_INCLUDED == TRUE)

system/main/shim/acl.cc

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "stack/btm/btm_sec_cb.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/l2c_api.h"

#include "stack/include/l2cap_module.h"

#include "stack/include/main_thread.h"

#include "types/ble_address_with_type.h"

#include "types/raw_address.h"

system/stack/fuzzers/l2cap_fuzzer.cc

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "stack/include/l2cap_acl_interface.h"

#include "stack/include/l2cap_controller_interface.h"

#include "stack/include/l2cap_hci_link_interface.h"

#include "stack/include/l2cap_module.h"

#include "stack/include/l2cdefs.h"

#include "test/fake/fake_osi.h"

#include "test/mock/mock_main_shim_entry.h"

system/stack/include/l2c_api.h

+0 −20
Original line number Diff line number Diff line
@@ -352,12 +352,6 @@ typedef struct { 
  uint8_t preferred_mode;

} tL2CAP_ERTM_INFO;



/**

 * Stack management declarations

 */

void l2c_init();

void l2c_free();



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

 *  External Function Declarations

 ****************************************************************************/
@@ -970,18 +964,4 @@ template <> 
struct formatter<tL2CAP_PRIORITY> : enum_formatter<tL2CAP_PRIORITY> {};

}  // namespace fmt



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

**

** Function         L2CA_Dumpsys

**

** Description      This function provides dumpsys data during the dumpsys

**                  procedure.

**

** Parameters:      fd: Descriptor used to write the L2CAP internals

**

** Returns          void

**

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

void L2CA_Dumpsys(int fd);



#endif /* L2C_API_H */

system/stack/test/stack_l2cap_test.cc

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "stack/btm/btm_int_types.h"

#include "stack/include/l2cap_controller_interface.h"

#include "stack/include/l2cap_hci_link_interface.h"

#include "stack/include/l2cap_module.h"

#include "stack/include/l2cdefs.h"

#include "stack/l2cap/l2c_int.h"

#include "test/mock/mock_main_shim_entry.h"