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

Commit 041ed730 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Idcd959b1,I33b14207,I44e72828,I8a29a276,I5fe0f362 am: 8ba16302 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1403916

Change-Id: Ie0af1187fdf8dfc8d245f1aedf2814c5f47a3069
parents 77895e71 8ba16302

system/main/shim/btm_api.h

+2 −3
Original line number Diff line number Diff line
@@ -1096,10 +1096,9 @@ tBTM_STATUS BTM_ReadRemoteVersion(const RawAddress& addr, uint8_t* lmp_version, 
 * Description      This function is called to read a remote device's

 *                  supported features mask (features mask located at page 0)

 *

 *                  Note: The size of device features mask page is

 *                  BTM_FEATURE_BYTES_PER_PAGE bytes.

 *

 * Returns          pointer to the remote supported features mask

 *                  The size of device features mask page is

 *                  HCI_FEATURE_BYTES_PER_PAGE bytes.

 *

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

uint8_t* BTM_ReadRemoteFeatures(const RawAddress& addr);

system/stack/acl/acl.h

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 


#include "stack/include/acl_api_types.h"

#include "stack/include/bt_types.h"

#include "stack/include/btm_api_types.h"

#include "stack/include/hcidefs.h"

#include "types/bt_transport.h"

#include "types/raw_address.h"



#define BTM_MAX_SCN_ 31  // PORT_MAX_RFC_PORTS packages/modules/Bluetooth/system/stack/include/rfcdefs.h

system/stack/btm/btm_ble_int_types.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define BTM_BLE_INT_TYPES_H



#include "osi/include/alarm.h"

#include "stack/include/btm_ble_api_types.h"



/* scanning enable status */

#define BTM_BLE_SCAN_ENABLE 0x01

system/stack/btm/btm_int.h

+1 −27
Original line number Diff line number Diff line
@@ -146,37 +146,16 @@ extern void wipe_secrets_and_remove(tBTM_SEC_DEV_REC* p_dev_rec); 
/* Internal functions provided by btm_sec.cc

 *********************************************

*/

extern void btm_sec_conn_req(const RawAddress& bda, uint8_t* dc);

extern void btm_create_conn_cancel_complete(uint8_t* p);



extern void btm_read_inq_tx_power_complete(uint8_t* p);



extern void btm_sec_dev_reset(void);

extern void btm_sec_abort_access_req(const RawAddress& bd_addr);

extern void btm_sec_auth_complete(uint16_t handle, uint8_t status);

extern void btm_sec_encrypt_change(uint16_t handle, uint8_t status,

                                   uint8_t encr_enable);

extern void btm_sec_connected(const RawAddress& bda, uint16_t handle,

                              uint8_t status, uint8_t enc_mode);

extern tBTM_STATUS btm_sec_disconnect(uint16_t handle, uint8_t reason);

extern void btm_sec_disconnected(uint16_t handle, uint8_t reason);

extern void btm_sec_rmt_name_request_complete(const RawAddress* bd_addr,

                                              uint8_t* bd_name, uint8_t status);

extern void btm_sec_rmt_host_support_feat_evt(uint8_t* p);

extern void btm_io_capabilities_req(const RawAddress& p);

extern void btm_io_capabilities_rsp(uint8_t* p);

extern void btm_proc_sp_req_evt(tBTM_SP_EVT event, uint8_t* p);

extern void btm_simple_pair_complete(uint8_t* p);

extern void btm_sec_link_key_notification(const RawAddress& p_bda,

                                          const Octet16& link_key,

                                          uint8_t key_type);

extern void btm_sec_link_key_request(uint8_t* p_event);

extern void btm_sec_pin_code_request(uint8_t* p_event);

extern void btm_sec_update_clock_offset(uint16_t handle, uint16_t clock_offset);

extern void btm_sec_dev_rec_cback_event(tBTM_SEC_DEV_REC* p_dev_rec,

                                        uint8_t res, bool is_le_trasnport);



extern void btm_sec_clear_ble_keys(tBTM_SEC_DEV_REC* p_dev_rec);



extern bool btm_ble_init_pseudo_addr(tBTM_SEC_DEV_REC* p_dev_rec,

                                     const RawAddress& new_pseudo_addr);

extern tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(
@@ -184,12 +163,7 @@ extern tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check( 
    tBTM_SEC_CALLBACK* p_callback, void* p_ref_data);



extern tINQ_DB_ENT* btm_inq_db_new(const RawAddress& p_bda);



extern void btm_rem_oob_req(uint8_t* p);

extern void btm_read_local_oob_complete(uint8_t* p);



extern void btm_acl_resubmit_page(void);

extern void btm_acl_paging(BT_HDR* p, const RawAddress& dest);

extern tBTM_STATUS btm_sec_execute_procedure(tBTM_SEC_DEV_REC* p_dev_rec);



#endif

system/stack/btm/btm_int_types.h

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

#include "stack/btm/btm_ble_int_types.h"

#include "stack/btm/security_device_record.h"

#include "stack/include/btm_ble_api_types.h"



#define BTM_SEC_IS_SM4(sm) ((bool)(BTM_SM4_TRUE == ((sm)&BTM_SM4_TRUE)))

#define BTM_SEC_IS_SM4_LEGACY(sm) ((bool)(BTM_SM4_KNOWN == ((sm)&BTM_SM4_TRUE)))