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

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

stack::acl::BTM_IsAclConnectionUpAndHandleValid Remove logging am: 21eae905 

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



Change-Id: I3ba875362e9297b010475b503943ae862cdd9858
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 27ae6e17 21eae905

system/stack/acl/btm_acl.cc

+0 −1
Original line number Diff line number Diff line
@@ -1138,7 +1138,6 @@ bool BTM_IsAclConnectionUpAndHandleValid(const RawAddress& remote_bda, 
                                         tBT_TRANSPORT transport) {

  tACL_CONN* p_acl = internal_.btm_bda_to_acl(remote_bda, transport);

  if (p_acl == nullptr) {

    log::warn("Unable to find active acl");

    return false;

  }

  return p_acl->hci_handle != HCI_INVALID_HANDLE;

system/stack/btm/btm_sec.cc

+10 −1
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ 
#include "stack/include/main_thread.h"

#include "stack/include/smp_api.h"

#include "stack/include/stack_metrics_logging.h"

#include "types/bt_transport.h"

#include "types/raw_address.h"



namespace {
@@ -798,6 +799,8 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 


  /* If connection already exists... */

  if (BTM_IsAclConnectionUpAndHandleValid(bd_addr, transport)) {

    log::debug("An ACL connection currently exists peer:{} transport:{}",

               bd_addr, bt_transport_text(transport));

    btm_sec_wait_and_start_authentication(p_dev_rec);



    btm_sec_cb.change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ);
@@ -806,12 +809,18 @@ tBTM_STATUS btm_sec_bond_by_transport(const RawAddress& bd_addr, 
    l2cu_update_lcb_4_bonding(bd_addr, true);

    return (BTM_CMD_STARTED);

  }

  log::debug("An ACL connection does not currently exist peer:{} transport:{}",

             bd_addr, bt_transport_text(transport));



  log::verbose("sec mode: {} sm4:x{:x}", btm_sec_cb.security_mode,

               p_dev_rec->sm4);

  if (!bluetooth::shim::GetController()->SupportsSimplePairing() ||

      (p_dev_rec->sm4 == BTM_SM4_KNOWN)) {

    if (btm_sec_check_prefetch_pin(p_dev_rec)) return (BTM_CMD_STARTED);

    if (btm_sec_check_prefetch_pin(p_dev_rec)) {

      log::debug("Class of device used to check for pin peer:{} transport:{}",

                 bd_addr, bt_transport_text(transport));

      return (BTM_CMD_STARTED);

    }

  }

  if ((btm_sec_cb.security_mode == BTM_SEC_MODE_SP ||

       btm_sec_cb.security_mode == BTM_SEC_MODE_SC) &&