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

Commit 4afb804a authored by Matthew Xie's avatar Matthew Xie Committed by Android Git Automerger
Browse files

am 17b6850d: Merge "Bluetooth: Reset Disconnect Reason on Connection Establishment" 

* commit '17b6850d':
  Bluetooth: Reset Disconnect Reason on Connection Establishment
parents 0ba5b1c9 17b6850d

system/stack/hid/hidh_conn.c

+4 −0
Original line number Diff line number Diff line
@@ -502,6 +502,8 @@ static void hidh_l2cif_config_ind (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg) 
     && (p_hcon->conn_state == HID_CONN_STATE_CONFIG))

    {

        p_hcon->conn_state = HID_CONN_STATE_CONNECTED;

        /* Reset disconnect reason to success, as connection successful */

        p_hcon->disc_reason = HID_SUCCESS;



        hh_cb.devices[dhandle].state = HID_DEV_CONNECTED;

        hh_cb.callback( dhandle,  hh_cb.devices[dhandle].addr, HID_HDEV_EVT_OPEN, 0, NULL ) ;
@@ -556,6 +558,8 @@ static void hidh_l2cif_config_cfm (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg) 
     && (p_hcon->conn_state == HID_CONN_STATE_CONFIG))

    {

        p_hcon->conn_state = HID_CONN_STATE_CONNECTED;

        /* Reset disconnect reason to success, as connection successful */

        p_hcon->disc_reason = HID_SUCCESS;



        hh_cb.devices[dhandle].state = HID_DEV_CONNECTED;

        hh_cb.callback( dhandle, hh_cb.devices[dhandle].addr, HID_HDEV_EVT_OPEN, 0, NULL ) ;