Consolidate native interfaces for checking bond status

BTM offers two sets of bond status interfaces. IsLinkKeyKnown() can be used for either transport but does not consider the temporary pairing. IsDeviceBonded() just checks if the device is bonded over any transport.
Both of these interfaces are now consolidated into a single interface which allows checking transport specific bond status or bond status irrespective of transport.

Test: mmm packages/modules/Bluetooth
Flag: EXEMPT refactor
Bug: 396433944

Change-Id: Icef05f847de04b7fc06e741313da88a48d2efe1c

4 files changed, 9 insertions, 9 deletions

diff --git a/system/test/mock/mock_stack_btm_interface.cc b/system/test/mock/mock_stack_btm_interface.cc
index 44c542081d..20a8f7a586 100644
--- a/system/test/mock/mock_stack_btm_interface.cc
+++ b/system/test/mock/mock_stack_btm_interface.cc
@@ -140,7 +140,7 @@ struct btm_client_interface_t default_btm_client_interface = {
                 .BTM_SecIsLeSecurityPending = [](const RawAddress& /* bd_addr */) -> bool {
                   return false;
                 },
-                .BTM_IsLinkKeyKnown = [](const RawAddress& /* bd_addr */,
+                .BTM_IsBonded = [](const RawAddress& /* bd_addr */,
                                          tBT_TRANSPORT /* transport */) -> bool { return false; },
                 .BTM_SetSecurityLevel = [](bool /* is_originator */, const char* /*p_name */,
                                            uint8_t /* service_id */, uint16_t /* sec_level */,
diff --git a/system/test/mock/mock_stack_btm_sec.cc b/system/test/mock/mock_stack_btm_sec.cc
index ca943498fe..532404c409 100644
--- a/system/test/mock/mock_stack_btm_sec.cc
+++ b/system/test/mock/mock_stack_btm_sec.cc
@@ -46,7 +46,7 @@ struct BTM_ConfirmReqReply BTM_ConfirmReqReply;
 struct BTM_IsAuthenticated BTM_IsAuthenticated;
 struct BTM_IsEncrypted BTM_IsEncrypted;
 struct BTM_IsLinkKeyAuthed BTM_IsLinkKeyAuthed;
-struct BTM_IsLinkKeyKnown BTM_IsLinkKeyKnown;
+struct BTM_IsBonded BTM_IsBonded;
 struct BTM_PINCodeReply BTM_PINCodeReply;
 struct BTM_PasskeyReqReply BTM_PasskeyReqReply;
 struct BTM_PeerSupportsSecureConnections BTM_PeerSupportsSecureConnections;
@@ -111,7 +111,7 @@ bool BTM_CanReadDiscoverableCharacteristics::return_value = false;
 bool BTM_IsAuthenticated::return_value = false;
 bool BTM_IsEncrypted::return_value = false;
 bool BTM_IsLinkKeyAuthed::return_value = false;
-bool BTM_IsLinkKeyKnown::return_value = false;
+bool BTM_IsBonded::return_value = false;
 bool BTM_PeerSupportsSecureConnections::return_value = false;
 tBTM_STATUS BTM_SecBond::return_value = tBTM_STATUS::BTM_SUCCESS;
 tBTM_STATUS BTM_SecBondCancel::return_value = tBTM_STATUS::BTM_SUCCESS;
@@ -155,9 +155,9 @@ bool BTM_IsLinkKeyAuthed(const RawAddress& bd_addr, tBT_TRANSPORT transport) {
   inc_func_call_count(__func__);
   return test::mock::stack_btm_sec::BTM_IsLinkKeyAuthed(bd_addr, transport);
 }
-bool BTM_IsLinkKeyKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport) {
+bool BTM_IsBonded(const RawAddress& bd_addr, tBT_TRANSPORT transport) {
   inc_func_call_count(__func__);
-  return test::mock::stack_btm_sec::BTM_IsLinkKeyKnown(bd_addr, transport);
+  return test::mock::stack_btm_sec::BTM_IsBonded(bd_addr, transport);
 }
 void BTM_PINCodeReply(const RawAddress& bd_addr, tBTM_STATUS res, uint8_t pin_len, uint8_t* p_pin) {
   inc_func_call_count(__func__);
diff --git a/system/test/mock/mock_stack_btm_sec.h b/system/test/mock/mock_stack_btm_sec.h
index a54782c9fb..3ae397be41 100644
--- a/system/test/mock/mock_stack_btm_sec.h
+++ b/system/test/mock/mock_stack_btm_sec.h
@@ -111,10 +111,10 @@ struct BTM_IsLinkKeyAuthed {
 };
 extern struct BTM_IsLinkKeyAuthed BTM_IsLinkKeyAuthed;
 
-// Name: BTM_IsLinkKeyKnown
+// Name: BTM_IsBonded
 // Params: const RawAddress& bd_addr, tBT_TRANSPORT transport
 // Return: bool
-struct BTM_IsLinkKeyKnown {
+struct BTM_IsBonded {
   static bool return_value;
   std::function<bool(const RawAddress& bd_addr, tBT_TRANSPORT transport)> body{
           [](const RawAddress& /* bd_addr */, tBT_TRANSPORT /* transport */) {
@@ -124,7 +124,7 @@ struct BTM_IsLinkKeyKnown {
     return body(bd_addr, transport);
   }
 };
-extern struct BTM_IsLinkKeyKnown BTM_IsLinkKeyKnown;
+extern struct BTM_IsBonded BTM_IsBonded;
 
 // Name: BTM_PINCodeReply
 // Params: const RawAddress& bd_addr, tBTM_STATUS res, uint8_t pin_len, uint8_t*
diff --git a/system/test/mock/mock_stack_security_client_interface.h b/system/test/mock/mock_stack_security_client_interface.h
index 224d880905..1487326ac5 100644
--- a/system/test/mock/mock_stack_security_client_interface.h
+++ b/system/test/mock/mock_stack_security_client_interface.h
@@ -44,7 +44,7 @@ struct MockSecurityClientInterface : public SecurityClientInterface {
   MOCK_METHOD((bool), BTM_IsEncrypted,
               (const RawAddress& /* bd_addr */, tBT_TRANSPORT /* transport */));
   MOCK_METHOD((bool), BTM_SecIsLeSecurityPending, (const RawAddress& /* bd_addr */));
-  MOCK_METHOD((bool), BTM_IsLinkKeyKnown,
+  MOCK_METHOD((bool), BTM_IsDeviceBonded,
               (const RawAddress& /* bd_addr */, tBT_TRANSPORT /* transport */));
   MOCK_METHOD((bool), BTM_SetSecurityLevel,
               (bool /* is_originator */, const char* /* p_name */, uint8_t /* service_id */,