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

Commit 03194142 authored by Hui Peng's avatar Hui Peng Committed by Automerger Merge Worker
Browse files

[Invisalign2] move btm_ble_sec apis signatures to btm_ble_sec.h am: 251409be 

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



Change-Id: I68da9c7d1c26628491fce637b9408bdcac674625
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9822d423 251409be

system/main/shim/btm_api.cc

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

#include "main/shim/controller.h"

#include "main/shim/helpers.h"

#include "main/shim/helpers.h"

#include "main/shim/stack.h"

#include "main/shim/stack.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_ble_sec.h"

#include "types/raw_address.h"

#include "types/raw_address.h"





uint16_t bluetooth::shim::BTM_GetHCIConnHandle(const RawAddress& remote_bda,

uint16_t bluetooth::shim::BTM_GetHCIConnHandle(const RawAddress& remote_bda,

system/main/shim/l2c_api.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,9 +33,9 @@ 
#include "osi/include/allocator.h"

#include "osi/include/allocator.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_sec.h"

#include "stack/btm/btm_sec.h"

#include "stack/btm/power_mode.h"

#include "stack/include/ble_acl_interface.h"

#include "stack/include/ble_acl_interface.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/bt_hdr.h"

#include "stack/include/btm_api.h"

#include "stack/include/btu_hcif.h"

#include "stack/include/btu_hcif.h"

#include "stack/include/gatt_api.h"

#include "stack/include/gatt_api.h"

#include "stack/include/main_thread.h"

#include "stack/include/main_thread.h"

system/stack/acl/ble_acl.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "os/log.h"

#include "os/log.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_sec.h"

#include "stack/btm/btm_sec.h"

#include "stack/gatt/connection_manager.h"

#include "stack/gatt/connection_manager.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_api.h"

system/stack/btm/btm_ble_addr.cc

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "crypto_toolbox/crypto_toolbox.h"

#include "crypto_toolbox/crypto_toolbox.h"

#include "device/include/controller.h"

#include "device/include/controller.h"

#include "os/log.h"

#include "os/log.h"

#include "stack/btm/btm_int_types.h"

#include "stack/include/acl_api.h"

#include "stack/include/acl_api.h"

#include "stack/include/bt_octets.h"

#include "stack/include/bt_octets.h"

#include "stack/include/btm_ble_privacy.h"

#include "stack/include/btm_ble_privacy.h"

system/stack/btm/btm_ble_bgconn.cc

+2 −2
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ 




#define LOG_TAG "ble_bgconn"

#define LOG_TAG "ble_bgconn"





#include "stack/btm/btm_ble_bgconn.h"



#include <cstdint>

#include <cstdint>

#include <unordered_map>

#include <unordered_map>
@@ -33,8 +35,6 @@ 
#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_ble_int.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_dev.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/btm_int_types.h"

#include "stack/btm/security_device_record.h"

#include "stack/include/acl_api.h"

#include "types/raw_address.h"

#include "types/raw_address.h"





extern tBTM_CB btm_cb;

extern tBTM_CB btm_cb;