diff options
| author | Chris Manton <cmanton@google.com> | 2022-03-18 16:03:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-18 16:03:42 +0000 |
| commit | 0f73119b1533aa984eeffc20e1e96ce48647bcdc (patch) | |
| tree | bc0885f6e9a2c90f645ca1d0d4070bc091af7c35 | |
| parent | e38cfa12bff3c78360e3f5672a80a68ebb2eecbf (diff) | |
| parent | 58583df6d8694de857129bc4fce9bac47bed5119 (diff) | |
legacy: Use proper types tBTM_SEC_BLE::tADDRESS_TYPE am: 9f1113cf94 am: fc298bb177 am: 58583df6d8
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2028967
Change-Id: I2c174e084aa5901eb88678559837126d85f1f1f0
| -rw-r--r-- | system/stack/acl/btm_acl.cc | 3 | ||||
| -rw-r--r-- | system/stack/include/acl_api.h | 3 | ||||
| -rw-r--r-- | system/test/mock/mock_stack_acl.cc | 3 | ||||
| -rw-r--r-- | system/test/mock/mock_stack_acl.h | 7 |
4 files changed, 10 insertions, 6 deletions
diff --git a/system/stack/acl/btm_acl.cc b/system/stack/acl/btm_acl.cc index 23353d5084..0cd291ee06 100644 --- a/system/stack/acl/btm_acl.cc +++ b/system/stack/acl/btm_acl.cc @@ -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) { diff --git a/system/stack/include/acl_api.h b/system/stack/include/acl_api.h index d86127c499..8faf15c748 100644 --- a/system/stack/include/acl_api.h +++ b/system/stack/include/acl_api.h @@ -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, diff --git a/system/test/mock/mock_stack_acl.cc b/system/test/mock/mock_stack_acl.cc index b9f405e23b..600cfbbc04 100644 --- a/system/test/mock/mock_stack_acl.cc +++ b/system/test/mock/mock_stack_acl.cc @@ -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( diff --git a/system/test/mock/mock_stack_acl.h b/system/test/mock/mock_stack_acl.h index bf6a909732..c6f29ca173 100644 --- a/system/test/mock/mock_stack_acl.h +++ b/system/test/mock/mock_stack_acl.h @@ -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); }; }; |