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

Commit c5690de0 authored by Mike J. Chen's avatar Mike J. Chen Committed by Android Git Automerger
Browse files

am b32ca8c4: Merge "Fix HID get_report callback support" into klp-modular-dev 

* commit 'b32ca8c4':
  Fix HID get_report callback support
parents bb992195 b32ca8c4

system/btif/src/btif_hh.c

+20 −5
Original line number Original line Diff line number Diff line
@@ -878,14 +878,28 @@ static void btif_hh_upstreams_evt(UINT16 event, char* p_param) 
                BTIF_TRACE_WARNING1("Error: cannot find device with handle %d", p_data->dev_status.handle);

                BTIF_TRACE_WARNING1("Error: cannot find device with handle %d", p_data->dev_status.handle);

            }

            }

            break;

            break;

        case BTA_HH_GET_RPT_EVT:

        case BTA_HH_GET_RPT_EVT: {

            BT_HDR *hdr = p_data->hs_data.rsp_data.p_rpt_data;

            UINT8 *data = NULL;

            UINT16 len = 0;



            BTIF_TRACE_DEBUG2("BTA_HH_GET_RPT_EVT: status = %d, handle = %d",

            BTIF_TRACE_DEBUG2("BTA_HH_GET_RPT_EVT: status = %d, handle = %d",

                 p_data->hs_data.status, p_data->hs_data.handle);

                 p_data->hs_data.status, p_data->hs_data.handle);

            p_dev = btif_hh_find_connected_dev_by_handle(p_data->conn.handle);

            /* p_rpt_data in HANDSHAKE response case */

            HAL_CBACK(bt_hh_callbacks, get_report_cb,(bt_bdaddr_t*) &(p_dev->bd_addr), (bthh_status_t) p_data->hs_data.status,

            if (hdr) {

                (uint8_t*) p_data->hs_data.rsp_data.p_rpt_data, BT_HDR_SIZE);

                data = (UINT8 *)(hdr + 1) + hdr->offset;

                len = hdr->len;

            }

            p_dev = btif_hh_find_connected_dev_by_handle(p_data->hs_data.handle);

            if (p_dev) {

                HAL_CBACK(bt_hh_callbacks, get_report_cb,

                          (bt_bdaddr_t*) &(p_dev->bd_addr),

                          (bthh_status_t) p_data->hs_data.status, data, len);

            } else {

                BTIF_TRACE_WARNING1("Error: cannot find device with handle %d", p_data->hs_data.handle);

            }

            break;

            break;



        }

        case BTA_HH_SET_RPT_EVT:

        case BTA_HH_SET_RPT_EVT:

            BTIF_TRACE_DEBUG2("BTA_HH_SET_RPT_EVT: status = %d, handle = %d",

            BTIF_TRACE_DEBUG2("BTA_HH_SET_RPT_EVT: status = %d, handle = %d",

            p_data->dev_status.status, p_data->dev_status.handle);

            p_data->dev_status.status, p_data->dev_status.handle);
@@ -1477,6 +1491,7 @@ static bt_status_t get_protocol (bt_bdaddr_t *bd_addr, bthh_protocol_mode_t prot 




    p_dev = btif_hh_find_connected_dev_by_bda(bd_addr);

    p_dev = btif_hh_find_connected_dev_by_bda(bd_addr);

    if (p_dev != NULL) {

    if (p_dev != NULL) {



        BTA_HhGetProtoMode(p_dev->dev_handle);

        BTA_HhGetProtoMode(p_dev->dev_handle);

    }

    }

    else {

    else {