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

Commit b7064d4f authored by Michael Sun's avatar Michael Sun
Browse files

btif: hh: emit (DIS)CONNECTING state when a remote device (dis)connect 

When a remote HID device initiates the connection to the host, a
BTA_HH_OPEN_EVT or a BTA_HH_CLOSE_EVT will be triggered, and the upper
layer will receive a CONNECTED or DISCONNECTED state callback upon
finishing handling this event. Unlike the connections initiated by the
host, where the attempt is identifiable, the remote devices triggered
only have status updates when connected or disconnected.

This patch has the hid host to upstream (dis)connecting event whenever
received the attempt from devices to help with the logging.

BUG: 240781725
Tag: #floss
Test: gd/cert/run
Test: gd/cert/run --topshim

Change-Id: Iff5e851fb3c98d991cd81d209af140e92937ce7d
parent f2e9257b

system/btif/src/btif_hh.cc

+6 −2
Original line number Original line Diff line number Diff line
@@ -785,8 +785,10 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 
      break;

      break;





    case BTA_HH_OPEN_EVT:

    case BTA_HH_OPEN_EVT:

      BTIF_TRACE_WARNING("%s: BTA_HH_OPN_EVT: handle=%d, status =%d", __func__,

      BTIF_TRACE_DEBUG("BTA_HH_OPEN_EVT: status = %d, handle = %d",

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

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

      HAL_CBACK(bt_hh_callbacks, connection_state_cb,

                (RawAddress*)&p_data->conn.bda, BTHH_CONN_STATE_CONNECTING);

      btif_hh_cb.pending_conn_address = RawAddress::kEmpty;

      btif_hh_cb.pending_conn_address = RawAddress::kEmpty;

      if (p_data->conn.status == BTA_HH_OK) {

      if (p_data->conn.status == BTA_HH_OK) {

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

        p_dev = btif_hh_find_connected_dev_by_handle(p_data->conn.handle);
@@ -849,6 +851,8 @@ static void btif_hh_upstreams_evt(uint16_t event, char* p_param) { 
    case BTA_HH_CLOSE_EVT:

    case BTA_HH_CLOSE_EVT:

      BTIF_TRACE_DEBUG("BTA_HH_CLOSE_EVT: status = %d, handle = %d",

      BTIF_TRACE_DEBUG("BTA_HH_CLOSE_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);

      HAL_CBACK(bt_hh_callbacks, connection_state_cb,

                (RawAddress*)&p_data->conn.bda, BTHH_CONN_STATE_DISCONNECTING);

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

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

      if (p_dev != NULL) {

      if (p_dev != NULL) {

        BTIF_TRACE_DEBUG("%s: uhid fd=%d local_vup=%d", __func__, p_dev->fd,

        BTIF_TRACE_DEBUG("%s: uhid fd=%d local_vup=%d", __func__, p_dev->fd,