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

Commit 9fab9d58 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge changes Ief4ed01f,I848bfc48 into main 

* changes:
  [Invisalign2] Separate security apis and data in btm (2)
  [Invisalign2] Separate security apis and data in btm (1)
parents 3e5b9b49 404ca88d

system/bta/ag/bta_ag_act.cc

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

#include "stack/include/l2c_api.h"

#include "stack/include/port_api.h"

#include "stack/include/btm_sec_api_types.h"

#include "stack/include/sdp_api.h"

#include "types/raw_address.h"

system/bta/dm/bta_dm_sec.cc

+3 −2
Original line number Diff line number Diff line
@@ -33,8 +33,9 @@ 
#include "btif/include/btif_storage.h"

#include "osi/include/compat.h"  // strlcpy

#include "osi/include/osi.h"     // UNUSED_ATTR

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/btm_ble_sec_api.h"

#include "stack/include/btm_sec_api.h"

#include "stack/include/btm_ble_sec_api_types.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/l2c_api.h"

#include "stack/include/security_client_callbacks.h"

system/bta/dm/bta_dm_sec_api.cc

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

#include "stack/include/bt_octets.h"

#include "stack/include/btm_api.h"

#include "stack/include/btm_ble_api.h"

#include "stack/include/btm_ble_sec_api.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/main_thread.h"

#include "types/raw_address.h"

system/bta/gatt/bta_gattc_act.cc

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

#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/btm_sec_api.h"

#include "stack/include/l2c_api.h"

#include "stack/include/main_thread.h"

#include "types/bluetooth/uuid.h"

system/bta/include/bta_sec_api.h

+3 −2
Original line number Diff line number Diff line
@@ -27,8 +27,9 @@ 
#include "bt_target.h"  // Must be first to define build configuration

#include "stack/include/bt_octets.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/btm_ble_api_types.h"

#include "stack/include/btm_sec_api_types.h"

#include "stack/include/btm_ble_sec_api_types.h"

#include "stack/include/bt_name.h"

#include "stack/include/hci_error_code.h"

#include "types/ble_address_with_type.h"

#include "types/bt_transport.h"