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

Commit 20bcae3e authored by kuanyuhuang's avatar kuanyuhuang Committed by Tom Huang
Browse files

Fix HID BTA_HH_GET_RPT_EVT callback data format 

When HID host send BTA_HH_GET_RPT_EVT packet but facing error, host will
use tBTA_HH_CBDATA as response packet. But, callback function
btif_hh_upstreams_evt expects tBTA_HH_HSDATA format for
BTA_HH_GET_RPT_EVT.

Bug: 216257125
Test: atest BluetoothInstrumentationTests, manually reproduce
Change-Id: I2170c12ad0e42807e3b7bbbe8bf04c2026488321
parent 980a4a61

system/bta/hh/bta_hh_act.cc

+39 −16
Original line number Original line Diff line number Diff line
@@ -1017,33 +1017,56 @@ static uint8_t convert_api_sndcmd_param(const tBTA_HH_CMD_DATA& api_sndcmd) { 
}

}





void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

void bta_hh_write_dev_act(tBTA_HH_DEV_CB* p_cb, const tBTA_HH_DATA* p_data) {

  tBTA_HH_CBDATA cbdata = {BTA_HH_OK, 0};

  uint16_t event =

  uint16_t event =

      (p_data->api_sndcmd.t_type - HID_TRANS_GET_REPORT) + BTA_HH_GET_RPT_EVT;

      (p_data->api_sndcmd.t_type - HID_TRANS_GET_REPORT) + BTA_HH_GET_RPT_EVT;





  if (p_cb->is_le_device)

  if (p_cb->is_le_device)

    bta_hh_le_write_dev_act(p_cb, p_data);

    bta_hh_le_write_dev_act(p_cb, p_data);

  else

  else {

  {



    cbdata.handle = p_cb->hid_handle;



    /* match up BTE/BTA report/boot mode def */

    /* match up BTE/BTA report/boot mode def */

    const uint8_t api_sndcmd_param =

    const uint8_t api_sndcmd_param =

        convert_api_sndcmd_param(p_data->api_sndcmd);

        convert_api_sndcmd_param(p_data->api_sndcmd);





    if (HID_HostWriteDev(p_cb->hid_handle, p_data->api_sndcmd.t_type,

    tHID_STATUS status = HID_HostWriteDev(p_cb->hid_handle,

                         api_sndcmd_param, p_data->api_sndcmd.data,

                                          p_data->api_sndcmd.t_type,

                                          api_sndcmd_param,

                                          p_data->api_sndcmd.data,

                                          p_data->api_sndcmd.rpt_id,

                                          p_data->api_sndcmd.rpt_id,

                         p_data->api_sndcmd.p_data) != HID_SUCCESS) {

                                          p_data->api_sndcmd.p_data);

      APPL_TRACE_ERROR("HID_HostWriteDev Error ");

    if (status != HID_SUCCESS) {

      cbdata.status = BTA_HH_ERR;

      LOG_ERROR("HID_HostWriteDev Error, status: %d", status);





      if (p_data->api_sndcmd.t_type != HID_TRANS_CONTROL &&

      if (p_data->api_sndcmd.t_type != HID_TRANS_CONTROL &&

          p_data->api_sndcmd.t_type != HID_TRANS_DATA)

          p_data->api_sndcmd.t_type != HID_TRANS_DATA) {

        (*bta_hh_cb.p_cback)(event, (tBTA_HH*)&cbdata);

        BT_HDR cbhdr = {

      else if (api_sndcmd_param == BTA_HH_CTRL_VIRTUAL_CABLE_UNPLUG)

          .event = BTA_HH_GET_RPT_EVT,

        (*bta_hh_cb.p_cback)(BTA_HH_VC_UNPLUG_EVT, (tBTA_HH*)&cbdata);

          .len = 0,

          .offset = 0,

          .layer_specific = 0,

        };

        tBTA_HH cbdata = {

          .hs_data = {

            .status = BTA_HH_ERR,

            .handle = p_cb->hid_handle,

            .rsp_data = {

              .p_rpt_data = &cbhdr,

            },

          },

        };

        (*bta_hh_cb.p_cback)(event, &cbdata);

      } else if (api_sndcmd_param == BTA_HH_CTRL_VIRTUAL_CABLE_UNPLUG) {

        tBTA_HH cbdata = {

          .dev_status = {

            .status = BTA_HH_ERR,

            .handle = p_cb->hid_handle,

          },

        };

        (*bta_hh_cb.p_cback)(BTA_HH_VC_UNPLUG_EVT, &cbdata);

      } else {

        LOG_ERROR("skipped executing callback in hid host error handling. "

                  "command type: %d, param: %d", p_data->api_sndcmd.t_type,

                  p_data->api_sndcmd.param);

      }

    } else {

    } else {

      switch (p_data->api_sndcmd.t_type) {

      switch (p_data->api_sndcmd.t_type) {

        case HID_TRANS_SET_PROTOCOL:

        case HID_TRANS_SET_PROTOCOL: