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

Commit 58583df6 authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: Use proper types tBTM_SEC_BLE::tADDRESS_TYPE am: 9f1113cf am: fc298bb1 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2028967

Change-Id: I1f5556d6228c43741c7deec1f24a8a58930b71e7
parents b1fc1f85 fc298bb1

system/stack/acl/btm_acl.cc

+2 −1
Original line number Diff line number Diff line
@@ -2282,7 +2282,8 @@ bool BTM_BLE_IS_RESOLVE_BDA(const RawAddress& x) { 


bool acl_refresh_remote_address(const RawAddress& identity_address,

                                tBLE_ADDR_TYPE identity_address_type,

                                const RawAddress& bda, tBLE_ADDR_TYPE rra_type,

                                const RawAddress& bda,

                                tBTM_SEC_BLE::tADDRESS_TYPE rra_type,

                                const RawAddress& rpa) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(bda, BT_TRANSPORT_LE);

  if (p_acl == nullptr) {

system/stack/include/acl_api.h

+2 −1
Original line number Diff line number Diff line
@@ -192,7 +192,8 @@ bool BTM_BLE_IS_RESOLVE_BDA(const RawAddress& x); 


bool acl_refresh_remote_address(const RawAddress& identity_address,

                                tBLE_ADDR_TYPE identity_address_type,

                                const RawAddress& remote_bda, uint8_t rra_type,

                                const RawAddress& remote_bda,

                                tBTM_SEC_BLE::tADDRESS_TYPE rra_type,

                                const RawAddress& rpa);



void btm_establish_continue_from_address(const RawAddress& remote_bda,

system/test/mock/mock_stack_acl.cc

+2 −1
Original line number Diff line number Diff line
@@ -272,7 +272,8 @@ bool acl_peer_supports_sniff_subrating(const RawAddress& remote_bda) { 
}

bool acl_refresh_remote_address(const RawAddress& identity_address,

                                tBLE_ADDR_TYPE identity_address_type,

                                const RawAddress& bda, tBLE_ADDR_TYPE rra_type,

                                const RawAddress& bda,

                                tBTM_SEC_BLE::tADDRESS_TYPE rra_type,

                                const RawAddress& rpa) {

  mock_function_count_map[__func__]++;

  return test::mock::stack_acl::acl_refresh_remote_address(

system/test/mock/mock_stack_acl.h

+4 −3
Original line number Diff line number Diff line
@@ -275,14 +275,15 @@ extern struct acl_peer_supports_sniff_subrating 
struct acl_refresh_remote_address {

  std::function<bool(

      const RawAddress& identity_address, tBLE_ADDR_TYPE identity_address_type,

      const RawAddress& bda, tBLE_ADDR_TYPE rra_type, const RawAddress& rpa)>

      const RawAddress& bda, tBTM_SEC_BLE::tADDRESS_TYPE rra_type,

      const RawAddress& rpa)>

      body{[](const RawAddress& identity_address,

              tBLE_ADDR_TYPE identity_address_type, const RawAddress& bda,

              tBLE_ADDR_TYPE rra_type,

              tBTM_SEC_BLE::tADDRESS_TYPE rra_type,

              const RawAddress& rpa) { return false; }};

  bool operator()(const RawAddress& identity_address,

                  tBLE_ADDR_TYPE identity_address_type, const RawAddress& bda,

                  tBLE_ADDR_TYPE rra_type, const RawAddress& rpa) {

                  tBTM_SEC_BLE::tADDRESS_TYPE rra_type, const RawAddress& rpa) {

    return body(identity_address, identity_address_type, bda, rra_type, rpa);

  };

};