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

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

bta::jv::tBTA_JV Unify variable decl/init 

Bug: 341970134
Test: m .
Flag: EXEMPT, Mechanical Refactor
Change-Id: Ic0532c1d724f2e1fc0b16d5998fa9c874f8ec899
parent 4ed5c6da

system/bta/jv/bta_jv_act.cc

+12 −12
Original line number Diff line number Diff line
@@ -1474,11 +1474,14 @@ void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn, 
  uint32_t event_mask = BTA_JV_RFC_EV_MASK;

  tPORT_STATE port_state;



  tBTA_JV_RFCOMM_CL_INIT evt_data = {

  tBTA_JV bta_jv = {

      .rfc_cl_init =

          {

              .status = tBTA_JV_STATUS::SUCCESS,

              .handle = 0,

              .sec_id = 0,

              .use_co = false,

          },

  };



  if (com::android::bluetooth::flags::rfcomm_always_use_mitm()) {
@@ -1495,7 +1498,7 @@ void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn, 
          peer_bd_addr, &handle, bta_jv_port_mgmt_cl_cback,

          sec_mask) != PORT_SUCCESS) {

    log::error("RFCOMM_CreateConnection failed");

    evt_data.status = tBTA_JV_STATUS::FAILURE;

    bta_jv.rfc_cl_init.status = tBTA_JV_STATUS::FAILURE;

  } else {

    tBTA_JV_PCB* p_pcb;

    tBTA_JV_RFC_CB* p_cb = bta_jv_alloc_rfc_cb(handle, &p_pcb);
@@ -1504,7 +1507,7 @@ void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn, 
      p_cb->scn = 0;

      p_pcb->state = BTA_JV_ST_CL_OPENING;

      p_pcb->rfcomm_slot_id = rfcomm_slot_id;

      evt_data.use_co = true;

      bta_jv.rfc_cl_init.use_co = true;



      if (PORT_SetEventCallback(handle, bta_jv_port_event_cl_cback) !=

          PORT_SUCCESS) {
@@ -1529,15 +1532,12 @@ void bta_jv_rfcomm_connect(tBTA_SEC sec_mask, uint8_t remote_scn, 
        log::warn("Unable to set RFCOMM client state handle:{}", handle);

      }



      evt_data.handle = p_cb->handle;

      bta_jv.rfc_cl_init.handle = p_cb->handle;

    } else {

      evt_data.status = tBTA_JV_STATUS::FAILURE;

      bta_jv.rfc_cl_init.status = tBTA_JV_STATUS::FAILURE;

      log::error("run out of rfc control block");

    }

  }

  tBTA_JV bta_jv = {

      .rfc_cl_init = evt_data,

  };



  p_cback(BTA_JV_RFCOMM_CL_INIT_EVT, &bta_jv, rfcomm_slot_id);

  if (bta_jv.rfc_cl_init.status == tBTA_JV_STATUS::FAILURE) {