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

Commit 9ada2d8b authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Remove unused parameter in btif_dm_proc_io_req 

Bug: 159815595
Tag: #refactor
Test: compile & verify basic functions working
Change-Id: Icdba620694968148b8f6766fc0ed47ee4d102472
parent 0beb762e

system/bta/dm/bta_dm_act.cc

+1 −3
Original line number Original line Diff line number Diff line
@@ -2035,9 +2035,7 @@ static uint8_t bta_dm_sp_cback(tBTM_SP_EVT event, tBTM_SP_EVT_DATA* p_data) { 
      if (btm_local_io_caps != BTM_IO_CAP_NONE) {

      if (btm_local_io_caps != BTM_IO_CAP_NONE) {

        /* translate auth_req */

        /* translate auth_req */

        btif_dm_set_oob_for_io_req(&p_data->io_req.oob_data);

        btif_dm_set_oob_for_io_req(&p_data->io_req.oob_data);

        btif_dm_proc_io_req(p_data->io_req.bd_addr, &p_data->io_req.io_cap,

        btif_dm_proc_io_req(&p_data->io_req.auth_req, p_data->io_req.is_orig);

                            &p_data->io_req.oob_data, &p_data->io_req.auth_req,

                            p_data->io_req.is_orig);

      }

      }

      APPL_TRACE_EVENT("io mitm: %d oob_data:%d", p_data->io_req.auth_req,

      APPL_TRACE_EVENT("io mitm: %d oob_data:%d", p_data->io_req.auth_req,

                       p_data->io_req.oob_data);

                       p_data->io_req.oob_data);

system/btif/include/btif_dm.h

+1 −3
Original line number Original line Diff line number Diff line
@@ -43,9 +43,7 @@ void btif_dm_on_disable(void); 
/**

/**

 * Callout for handling io_capabilities request

 * Callout for handling io_capabilities request

 */

 */

void btif_dm_proc_io_req(const RawAddress& bd_addr, tBTM_IO_CAP* p_io_cap,

void btif_dm_proc_io_req(tBTM_AUTH_REQ* p_auth_req, bool is_orig);

                         tBTM_OOB_DATA* p_oob_data, tBTM_AUTH_REQ* p_auth_req,

                         bool is_orig);

/**

/**

 * Callout for handling io_capabilities response

 * Callout for handling io_capabilities response

 */

 */

system/btif/src/btif_dm.cc

+1 −4
Original line number Original line Diff line number Diff line
@@ -2148,10 +2148,7 @@ void btif_dm_enable_service(tBTA_SERVICE_ID service_id, bool enable) { 
  return;

  return;

}

}





void btif_dm_proc_io_req(UNUSED_ATTR const RawAddress& bd_addr,

void btif_dm_proc_io_req(tBTM_AUTH_REQ* p_auth_req, bool is_orig) {

                         UNUSED_ATTR tBTM_IO_CAP* p_io_cap,

                         UNUSED_ATTR tBTM_OOB_DATA* p_oob_data,

                         tBTM_AUTH_REQ* p_auth_req, bool is_orig) {

  uint8_t yes_no_bit = BTA_AUTH_SP_YES & *p_auth_req;

  uint8_t yes_no_bit = BTA_AUTH_SP_YES & *p_auth_req;

  /* if local initiated:

  /* if local initiated:

  **      1. set DD + MITM

  **      1. set DD + MITM