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

Commit 13b0fbd1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Resolved bond lost problem with proper condition" am: 70dc67f1 am:... 

Merge "Resolved bond lost problem with proper condition" am: 70dc67f1 am: 891c9c9e am: 56a5b84d am: 02246429

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

Change-Id: I7ee34d741b61cb566616048ae5c28176a509dc49
parents 78ee8bc9 02246429

system/stack/btm/btm_sec.cc

+21 −8
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include "stack/include/acl_api.h"

#include "stack/include/acl_hci_link_interface.h"

#include "stack/include/btm_status.h"

#include "stack/include/btu.h"  // do_in_main_thread

#include "stack/include/l2cap_security_interface.h"

#include "stack/include/stack_metrics_logging.h"

#include "stack/smp/smp_int.h"
@@ -4404,12 +4405,16 @@ static bool btm_sec_start_get_name(tBTM_SEC_DEV_REC* p_dev_rec) { 
 *

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

static void btm_sec_wait_and_start_authentication(tBTM_SEC_DEV_REC* p_dev_rec) {

  if (alarm_is_scheduled(btm_cb.execution_wait_timer)) {

    BTM_TRACE_EVENT("%s: alarm already scheduled", __func__);

    return;

  p_dev_rec->sec_state = BTM_SEC_STATE_AUTHENTICATING;

  auto addr = new RawAddress(p_dev_rec->bd_addr);

  bt_status_t status = do_in_main_thread_delayed(

      FROM_HERE, base::Bind(&btm_sec_auth_timer_timeout, addr),

      base::TimeDelta::FromMilliseconds(BTM_DELAY_AUTH_MS));

  if (status != BT_STATUS_SUCCESS) {

    LOG(ERROR) << __func__

               << ": do_in_main_thread_delayed failed. directly calling.";

    btm_sec_auth_timer_timeout(addr);

  }

  alarm_set(btm_cb.execution_wait_timer, BTM_DELAY_AUTH_MS,

            btm_sec_auth_timer_timeout, p_dev_rec);

}



/*******************************************************************************
@@ -4420,10 +4425,18 @@ static void btm_sec_wait_and_start_authentication(tBTM_SEC_DEV_REC* p_dev_rec) { 
 *

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

static void btm_sec_auth_timer_timeout(void* data) {

  tBTM_SEC_DEV_REC* p_dev_rec = (tBTM_SEC_DEV_REC*)data;

  p_dev_rec->sec_state = BTM_SEC_STATE_AUTHENTICATING;

  RawAddress* p_addr = (RawAddress*)data;

  tBTM_SEC_DEV_REC* p_dev_rec = btm_find_dev(*p_addr);

  delete p_addr;

  if (p_dev_rec == NULL) {

    LOG_INFO("%s: invalid device or not found", __func__);

  } else if (btm_dev_authenticated(p_dev_rec)) {

    LOG_INFO("%s: device is already authenticated", __func__);

  } else {

    LOG_INFO("%s: starting authentication", __func__);

    btsnd_hcic_auth_request(p_dev_rec->hci_handle);

  }

}



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

 *