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

Commit 797b69fe authored by Jakub Pawlowski's avatar Jakub Pawlowski
Browse files

Fix connection handle data type 

conn_handle should be uint16_t, not uint8_t.

Test: compilation test
Bug: 64232952
Change-Id: Ibce88e2cf2f74f402ea26f7471e5ac35aef6229b
parent 934457d5

system/stack/btm/btm_acl.cc

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

  uint8_t idx = btm_handle_to_acl_index(conn_handle);

  if (idx != MAX_L2CAP_LINKS) {

  if (idx != MAX_L2CAP_LINKS) {

    btm_cb.acl_db[idx].conn_addr = address;

    btm_cb.acl_db[idx].conn_addr = address;

system/stack/btm/btm_int.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

extern tACL_CONN* btm_bda_to_acl(const RawAddress& bda,

                                 tBT_TRANSPORT transport);

                                 tBT_TRANSPORT transport);

extern bool btm_acl_notif_conn_collision(const RawAddress& bda);

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);

                                     const RawAddress& address);





extern void btm_pm_reset(void);

extern void btm_pm_reset(void);

system/stack/include/ble_advertiser.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -35,7 +35,7 @@ using ParametersCb = 
void btm_ble_update_dmt_flag_bits(uint8_t* flag_value,

void btm_ble_update_dmt_flag_bits(uint8_t* flag_value,

                                  const uint16_t connect_mode,

                                  const uint16_t connect_mode,

                                  const uint16_t disc_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:

// methods we expose to c code:

void btm_ble_multi_adv_cleanup(void);

void btm_ble_multi_adv_cleanup(void);

system/stack/test/ble_advertiser_test.cc

+2 −1
Original line number Original line Diff line number Diff line
@@ -50,7 +50,8 @@ void BTM_GetDeviceIDRoot(BT_OCTET16 irk) {} 
void btm_ble_update_dmt_flag_bits(uint8_t* flag_value,

void btm_ble_update_dmt_flag_bits(uint8_t* flag_value,

                                  const uint16_t connect_mode,

                                  const uint16_t connect_mode,

                                  const uint16_t disc_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) {

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};

  uint8_t fake_rand[8] = {0, 0, 0, 0, 0, 0, 0, 0};

  cb.Run(fake_rand);

  cb.Run(fake_rand);