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

Commit 0879b5ae authored by Chris Manton's avatar Chris Manton
Browse files

[7/24] Canonical form tBTM_STATUS::BTM_DEVICE_TIMEOUT 

Prepare for class enum-ify tBTM_STATUS

Bug: 358402071
Test: m .
Flag: EXEMPT, Mechanical Refactor

Change-Id: Ia2fb869df1898f68e6e4beca5b3d5031c477b61a
parent 34b6c08b

system/stack/acl/btm_acl.cc

+2 −2
Original line number Diff line number Diff line
@@ -1783,7 +1783,7 @@ void btm_read_rssi_timeout(void* /* data */) { 
  tBTM_RSSI_RESULT result;

  tBTM_CMPL_CB* p_cb = btm_cb.devcb.p_rssi_cmpl_cb;

  btm_cb.devcb.p_rssi_cmpl_cb = NULL;

  result.status = BTM_DEVICE_TIMEOUT;

  result.status = tBTM_STATUS::BTM_DEVICE_TIMEOUT;

  if (p_cb) {

    (*p_cb)(&result);

  }
@@ -1855,7 +1855,7 @@ void btm_read_failed_contact_counter_timeout(void* /* data */) { 
  tBTM_FAILED_CONTACT_COUNTER_RESULT result;

  tBTM_CMPL_CB* p_cb = btm_cb.devcb.p_failed_contact_counter_cmpl_cb;

  btm_cb.devcb.p_failed_contact_counter_cmpl_cb = NULL;

  result.status = BTM_DEVICE_TIMEOUT;

  result.status = tBTM_STATUS::BTM_DEVICE_TIMEOUT;

  if (p_cb) {

    (*p_cb)(&result);

  }

system/stack/btm/btm_sec.cc

+1 −1
Original line number Diff line number Diff line
@@ -3642,7 +3642,7 @@ void btm_sec_connected(const RawAddress& bda, uint16_t handle, tHCI_STATUS statu 


    if (status == HCI_ERR_CONNECTION_TOUT || status == HCI_ERR_LMP_RESPONSE_TIMEOUT ||

        status == HCI_ERR_UNSPECIFIED || status == HCI_ERR_PAGE_TIMEOUT) {

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_DEVICE_TIMEOUT, false);

      btm_sec_dev_rec_cback_event(p_dev_rec, tBTM_STATUS::BTM_DEVICE_TIMEOUT, false);

    } else {

      btm_sec_dev_rec_cback_event(p_dev_rec, BTM_ERR_PROCESSING, false);

    }