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

Commit afd4eb37 authored by Hui Peng's avatar Hui Peng Committed by Gerrit Code Review
Browse files

Merge "[Invisalign2] Move BTM_IsRemoteNameKnown to btm_sec" into main

parents ca1dbdc5 028f2120

system/bta/dm/bta_dm_disc.cc

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include "stack/include/bt_uuid16.h"

#include "stack/include/btm_client_interface.h"

#include "stack/include/btm_log_history.h"

#include "stack/include/btm_sec_api.h"

#include "stack/include/gap_api.h"

#include "stack/include/gatt_api.h"

#include "stack/include/sdp_status.h"

system/stack/btm/btm_dev.cc

+5 −0
Original line number Diff line number Diff line
@@ -784,3 +784,8 @@ const tBLE_BD_ADDR BTM_Sec_GetAddressWithType(const RawAddress& bd_addr) { 
    return p_dev_rec->ble.identity_address_with_type;

  }

}



bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  return (p_dev_rec == nullptr) ? false : p_dev_rec->is_name_known();

}

system/stack/btm/btm_dev.h

+2 −0
Original line number Diff line number Diff line
@@ -210,3 +210,5 @@ std::vector<tBTM_SEC_DEV_REC*> btm_get_sec_dev_rec(); 


bool BTM_Sec_AddressKnown(const RawAddress& address);

const tBLE_BD_ADDR BTM_Sec_GetAddressWithType(const RawAddress& bd_addr);



bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport);

system/stack/btm/btm_inq.cc

+0 −5
Original line number Diff line number Diff line
@@ -758,11 +758,6 @@ tBTM_STATUS BTM_CancelRemoteDeviceName(void) { 
    return (BTM_WRONG_MODE);

}



bool BTM_IsRemoteNameKnown(const RawAddress& bd_addr, tBT_TRANSPORT transport) {

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(bd_addr);

  return (p_dev_rec == nullptr) ? false : p_dev_rec->is_name_known();

}



/*******************************************************************************

 *

 * Function         BTM_InqDbRead

system/stack/include/btm_api.h

+0 −16
Original line number Diff line number Diff line
@@ -350,22 +350,6 @@ tBTM_STATUS BTM_ReadRemoteDeviceName(const RawAddress& remote_bda, 
 ******************************************************************************/

tBTM_STATUS BTM_CancelRemoteDeviceName(void);



/*******************************************************************************

 *

 * Function         BTM_IsRemoteNameKnown

 *

 * Description      This function checks if the remote name is known.

 *

 * Input Params:    bd_addr: Address of remote

 *                  transport: Transport, auto if unknown

 *

 * Returns

 *                  true if name is known, false otherwise

 *

 ******************************************************************************/

bool BTM_IsRemoteNameKnown(const RawAddress& remote_bda,

                           tBT_TRANSPORT transport);



/*******************************************************************************

 *

 * Function         BTM_IsRemoteVersionReceived