From 73af4033702ae58a24975a09134a7bf698b5cbd8 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowski Date: Fri, 18 Aug 2017 04:14:22 -0700 Subject: [PATCH] Fix connection handle data type conn_handle should be uint16_t, not uint8_t. Test: compilation test Bug: 64232952 Change-Id: Ibce88e2cf2f74f402ea26f7471e5ac35aef6229b --- stack/btm/btm_acl.cc | 2 +- stack/btm/btm_int.h | 2 +- stack/include/ble_advertiser.h | 2 +- stack/test/ble_advertiser_test.cc | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stack/btm/btm_acl.cc b/stack/btm/btm_acl.cc index db030ae43..03ce9d08f 100644 --- a/stack/btm/btm_acl.cc +++ b/stack/btm/btm_acl.cc @@ -293,7 +293,7 @@ void btm_acl_created(const RawAddress& bda, DEV_CLASS dc, BD_NAME bdn, } } -void btm_acl_update_conn_addr(uint8_t conn_handle, const RawAddress& address) { +void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address) { uint8_t idx = btm_handle_to_acl_index(conn_handle); if (idx != MAX_L2CAP_LINKS) { btm_cb.acl_db[idx].conn_addr = address; diff --git a/stack/btm/btm_int.h b/stack/btm/btm_int.h index 3abf53e94..2d0446225 100644 --- a/stack/btm/btm_int.h +++ b/stack/btm/btm_int.h @@ -124,7 +124,7 @@ extern uint16_t btm_get_max_packet_size(const RawAddress& addr); extern tACL_CONN* btm_bda_to_acl(const RawAddress& bda, tBT_TRANSPORT transport); extern bool btm_acl_notif_conn_collision(const RawAddress& bda); -extern void btm_acl_update_conn_addr(uint8_t conn_handle, +extern void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address); extern void btm_pm_reset(void); diff --git a/stack/include/ble_advertiser.h b/stack/include/ble_advertiser.h index 5452881f4..9ec84d256 100644 --- a/stack/include/ble_advertiser.h +++ b/stack/include/ble_advertiser.h @@ -35,7 +35,7 @@ using ParametersCb = void btm_ble_update_dmt_flag_bits(uint8_t* flag_value, const uint16_t connect_mode, const uint16_t disc_mode); -void btm_acl_update_conn_addr(uint8_t conn_handle, const RawAddress& address); +void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address); // methods we expose to c code: void btm_ble_multi_adv_cleanup(void); diff --git a/stack/test/ble_advertiser_test.cc b/stack/test/ble_advertiser_test.cc index df2a4d45c..39d585a43 100644 --- a/stack/test/ble_advertiser_test.cc +++ b/stack/test/ble_advertiser_test.cc @@ -50,7 +50,8 @@ void BTM_GetDeviceIDRoot(BT_OCTET16 irk) {} void btm_ble_update_dmt_flag_bits(uint8_t* flag_value, const uint16_t connect_mode, const uint16_t disc_mode) {} -void btm_acl_update_conn_addr(uint8_t conn_handle, const RawAddress& address) {} +void btm_acl_update_conn_addr(uint16_t conn_handle, const RawAddress& address) { +} void btm_gen_resolvable_private_addr(base::Callback cb) { uint8_t fake_rand[8] = {0, 0, 0, 0, 0, 0, 0, 0}; cb.Run(fake_rand); -- 2.11.0