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

Commit 4ef3cfb3 authored by Chris Manton's avatar Chris Manton
Browse files

rnr: Add hci status to remote name read callback data 

Bug: 254358644
Test: gd/cert/run
Tag: #refactor
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines
Ignore-AOSP-First: Cherry-pick

Merged-In: I9110bf52569ec38b517c1de1e5a5d22fcbc52b8f
Change-Id: I9110bf52569ec38b517c1de1e5a5d22fcbc52b8f
parent 655bfd1f

system/bta/dm/bta_dm_act.cc

+3 −2
Original line number Diff line number Diff line
@@ -1906,7 +1906,7 @@ static void bta_dm_inq_cmpl_cb(void* p_result) { 
static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr,

                                                UNUSED_ATTR DEV_CLASS dc,

                                                tBTM_BD_NAME bd_name) {

  tBTM_REMOTE_DEV_NAME rem_name;

  tBTM_REMOTE_DEV_NAME rem_name = {};

  tBTM_STATUS btm_status;



  APPL_TRACE_DEBUG("%s name=<%s>", __func__, bd_name);
@@ -1920,7 +1920,7 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, 
      rem_name.length = BD_NAME_LEN;

    }

    rem_name.status = BTM_SUCCESS;



    rem_name.hci_status = HCI_SUCCESS;

    bta_dm_remname_cback(&rem_name);

  } else {

    /* get name of device */
@@ -1941,6 +1941,7 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, 
      rem_name.length = 0;

      rem_name.remote_bd_name[0] = 0;

      rem_name.status = btm_status;

      rem_name.hci_status = HCI_SUCCESS;

      bta_dm_remname_cback(&rem_name);

    }

  }

system/stack/btm/btm_inq.cc

+7 −6
Original line number Diff line number Diff line
@@ -760,7 +760,7 @@ tBTM_STATUS BTM_ClearInqDb(const RawAddress* p_bda) { 
 *

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

void btm_inq_db_reset(void) {

  tBTM_REMOTE_DEV_NAME rem_name;

  tBTM_REMOTE_DEV_NAME rem_name = {};

  tBTM_INQUIRY_VAR_ST* p_inq = &btm_cb.btm_inq_vars;

  uint8_t num_responses;

  uint8_t temp_inq_active;
@@ -790,6 +790,7 @@ void btm_inq_db_reset(void) { 


    if (p_inq->p_remname_cmpl_cb) {

      rem_name.status = BTM_DEV_RESET;

      rem_name.hci_status = HCI_SUCCESS;



      (*p_inq->p_remname_cmpl_cb)(&rem_name);

      p_inq->p_remname_cmpl_cb = NULL;
@@ -1445,6 +1446,7 @@ void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn, 
      rem_name.length = (evt_len < BD_NAME_LEN) ? evt_len : BD_NAME_LEN;

      rem_name.remote_bd_name[rem_name.length] = 0;

      rem_name.status = BTM_SUCCESS;

      rem_name.hci_status = hci_status;

      temp_evt_len = rem_name.length;



      while (temp_evt_len > 0) {
@@ -1452,12 +1454,11 @@ void btm_process_remote_name(const RawAddress* bda, const BD_NAME bdn, 
        temp_evt_len--;

      }

      rem_name.remote_bd_name[rem_name.length] = 0;

    }



    } else {

      /* If processing a stand alone remote name then report the error in the

         callback */

    else {

      rem_name.status = BTM_BAD_VALUE_RET;

      rem_name.hci_status = hci_status;

      rem_name.length = 0;

      rem_name.remote_bd_name[0] = 0;

    }

system/stack/btm/neighbor_inquiry.h

+2 −1
Original line number Diff line number Diff line
@@ -242,10 +242,11 @@ typedef struct { 


/* Structure returned with remote name  request */

typedef struct {

  uint16_t status;

  tBTM_STATUS status;

  RawAddress bd_addr;

  uint16_t length;

  BD_NAME remote_bd_name;

  tHCI_STATUS hci_status;

} tBTM_REMOTE_DEV_NAME;



typedef union /* contains the inquiry filter condition */