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

Commit e7662ce6 authored by Chris Manton's avatar Chris Manton
Browse files

stack::rnr::tBTM_REMOTE_DEV_NAME.status => btm_status 

Explicitly qualify btm status type as multiple status within struct

Bug: 354264933
Test: m .
Flag: EXEMPT, Name Qualification

Change-Id: I7b7bdd2c7f7be08092792b857c4694577aa236c8
parent c746b8fc

system/bta/dm/bta_dm_device_search.cc

+1 −1
Original line number Diff line number Diff line
@@ -248,7 +248,7 @@ static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p_remote_name) { 
  log::info(

          "Remote name request complete peer:{} btm_status:{} hci_status:{} "

          "name[0]:{:c} length:{}",

          p_remote_name->bd_addr, btm_status_text(p_remote_name->status),

          p_remote_name->bd_addr, btm_status_text(p_remote_name->btm_status),

          hci_error_code_text(p_remote_name->hci_status), p_remote_name->remote_bd_name[0],

          strnlen((const char*)p_remote_name->remote_bd_name, BD_NAME_LEN));

system/bta/dm/bta_dm_disc_legacy.cc

+3 −3
Original line number Diff line number Diff line
@@ -1384,7 +1384,7 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, DEV_C 
  if (bta_dm_search_cb.peer_bdaddr == bd_addr) {

    rem_name.bd_addr = bd_addr;

    bd_name_copy(rem_name.remote_bd_name, bd_name);

    rem_name.status = tBTM_STATUS::BTM_SUCCESS;

    rem_name.btm_status = tBTM_STATUS::BTM_SUCCESS;

    rem_name.hci_status = HCI_SUCCESS;

    bta_dm_remname_cback(&rem_name);

  } else {
@@ -1402,7 +1402,7 @@ static void bta_dm_service_search_remname_cback(const RawAddress& bd_addr, DEV_C 
      // actual peer_bdaddr

      rem_name.bd_addr = bta_dm_search_cb.peer_bdaddr;

      rem_name.remote_bd_name[0] = 0;

      rem_name.status = btm_status;

      rem_name.btm_status = btm_status;

      rem_name.hci_status = HCI_SUCCESS;

      bta_dm_remname_cback(&rem_name);

    }
@@ -1423,7 +1423,7 @@ static void bta_dm_remname_cback(const tBTM_REMOTE_DEV_NAME* p_remote_name) { 


  log::info(

          "Remote name request complete peer:{} btm_status:{} hci_status:{} name[0]:{:c} length:{}",

          p_remote_name->bd_addr, btm_status_text(p_remote_name->status),

          p_remote_name->bd_addr, btm_status_text(p_remote_name->btm_status),

          hci_error_code_text(p_remote_name->hci_status), p_remote_name->remote_bd_name[0],

          strnlen((const char*)p_remote_name->remote_bd_name, BD_NAME_LEN));

system/bta/dm/bta_dm_sec.cc

+2 −2
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) { 
    sec_event.cfm_req.dev_class = bta_dm_sec_cb.pin_dev_class;

    log::info("CoD: sec_event.cfm_req.dev_class = {}", dev_class_text(sec_event.cfm_req.dev_class));



    if (p_result && p_result->status == tBTM_STATUS::BTM_SUCCESS) {

    if (p_result && p_result->btm_status == tBTM_STATUS::BTM_SUCCESS) {

      bd_name_copy(sec_event.cfm_req.bd_name, p_result->remote_bd_name);

    } else { /* No name found */

      sec_event.cfm_req.bd_name[0] = 0;
@@ -227,7 +227,7 @@ static void bta_dm_pinname_cback(const tBTM_REMOTE_DEV_NAME* p_data) { 
    sec_event.pin_req.bd_addr = bta_dm_sec_cb.pin_bd_addr;

    sec_event.pin_req.dev_class = bta_dm_sec_cb.pin_dev_class;



    if (p_result && p_result->status == tBTM_STATUS::BTM_SUCCESS) {

    if (p_result && p_result->btm_status == tBTM_STATUS::BTM_SUCCESS) {

      bd_name_copy(sec_event.pin_req.bd_name, p_result->remote_bd_name);

    } else { /* No name found */

      sec_event.pin_req.bd_name[0] = 0;

system/bta/test/bta_dm_test.cc

+3 −3
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ TEST_F(BtaDmTest, bta_dm_remname_cback__typical) { 
  search_cb.name_discover_done = false;



  tBTM_REMOTE_DEV_NAME name = {

          .status = tBTM_STATUS::BTM_SUCCESS,

          .btm_status = tBTM_STATUS::BTM_SUCCESS,

          .bd_addr = kRawAddress,

          .remote_bd_name = {},

          .hci_status = HCI_SUCCESS,
@@ -330,7 +330,7 @@ TEST_F(BtaDmTest, bta_dm_remname_cback__wrong_address) { 
  search_cb.name_discover_done = false;



  tBTM_REMOTE_DEV_NAME name = {

          .status = tBTM_STATUS::BTM_SUCCESS,

          .btm_status = tBTM_STATUS::BTM_SUCCESS,

          .bd_addr = kRawAddress2,

          .remote_bd_name = {},

          .hci_status = HCI_SUCCESS,
@@ -348,7 +348,7 @@ TEST_F(BtaDmTest, bta_dm_remname_cback__HCI_ERR_CONNECTION_EXISTS) { 
  search_cb.name_discover_done = false;



  tBTM_REMOTE_DEV_NAME name = {

          .status = tBTM_STATUS::BTM_SUCCESS,

          .btm_status = tBTM_STATUS::BTM_SUCCESS,

          .bd_addr = RawAddress::kEmpty,

          .remote_bd_name = {},

          .hci_status = HCI_ERR_CONNECTION_EXISTS,

system/stack/btm/btm_inq.cc

+1 −1
Original line number Diff line number Diff line
@@ -951,7 +951,7 @@ void btm_inq_db_reset(void) { 
    btm_cb.rnr.remname_dev_type = BT_DEVICE_TYPE_UNKNOWN;



    if (btm_cb.rnr.p_remname_cmpl_cb) {

      rem_name.status = BTM_DEV_RESET;

      rem_name.btm_status = BTM_DEV_RESET;

      rem_name.hci_status = HCI_SUCCESS;



      (*btm_cb.rnr.p_remname_cmpl_cb)(&rem_name);