Fix connection handle data type
conn_handle should be uint16_t, not uint8_t.
Test: compilation test
Bug: 64232952
Change-Id: Ibce88e2cf2f74f402ea26f7471e5ac35aef6229b
Merged-In: Ibce88e2cf2f74f402ea26f7471e5ac35aef6229b
diff --git a/system/stack/btm/btm_acl.cc b/system/stack/btm/btm_acl.cc
index 4644ad8..16f49f8 100644
--- a/system/stack/btm/btm_acl.cc
+++ b/system/stack/btm/btm_acl.cc
@@ -293,7 +293,7 @@
}
}
-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/system/stack/btm/btm_int.h b/system/stack/btm/btm_int.h
index 3abf53e..2d04462 100644
--- a/system/stack/btm/btm_int.h
+++ b/system/stack/btm/btm_int.h
@@ -124,7 +124,7 @@
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/system/stack/include/ble_advertiser.h b/system/stack/include/ble_advertiser.h
index 5452881..9ec84d2 100644
--- a/system/stack/include/ble_advertiser.h
+++ b/system/stack/include/ble_advertiser.h
@@ -35,7 +35,7 @@
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/system/stack/test/ble_advertiser_test.cc b/system/stack/test/ble_advertiser_test.cc
index df2a4d4..39d585a 100644
--- a/system/stack/test/ble_advertiser_test.cc
+++ b/system/stack/test/ble_advertiser_test.cc
@@ -50,7 +50,8 @@
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<void(uint8_t[8])> cb) {
uint8_t fake_rand[8] = {0, 0, 0, 0, 0, 0, 0, 0};
cb.Run(fake_rand);
