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

Commit 03881af9 authored by Myles Watson's avatar Myles Watson
Browse files

bt_target.h: Remove always FALSE BTM_SEC_FORCE_RNR_FOR_DBOND 

Bug: 327390105
Test: mma -j32
Flag: EXEMPT, build-only change
Change-Id: I581cff84b7adf808648dd98f436419f3b7d9e816
parent da46cc9e

system/internal_include/bt_target.h

+0 −6
Original line number Diff line number Diff line
@@ -244,12 +244,6 @@ 
#define BTM_SEC_MAX_SERVICE_RECORDS 32

#endif



/* If True, force a retrieval of remote device name for each bond in case it's

 * changed */

#ifndef BTM_SEC_FORCE_RNR_FOR_DBOND

#define BTM_SEC_FORCE_RNR_FOR_DBOND FALSE

#endif



/* Maximum device name length used in btm database. */

#ifndef BTM_MAX_REM_BD_NAME_LEN

#define BTM_MAX_REM_BD_NAME_LEN 248

system/stack/btm/btm_sec.cc

+0 −4
Original line number Diff line number Diff line
@@ -689,10 +689,6 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
  log::verbose("BTM_SecBond: Remote sm4: 0x{:x}  HCI Handle: 0x{:04x}",

               p_dev_rec->sm4, p_dev_rec->hci_handle);



#if (BTM_SEC_FORCE_RNR_FOR_DBOND == TRUE)

  p_dev_rec->sec_rec.sec_flags &= ~BTM_SEC_NAME_KNOWN;

#endif



  /* If connection already exists... */

  if (BTM_IsAclConnectionUpAndHandleValid(bd_addr, transport)) {

    btm_sec_wait_and_start_authentication(p_dev_rec);