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

Commit b8041062 authored by Matthew Xie's avatar Matthew Xie Committed by Android Partner Code Review
Browse files

Merge "GAP: Handled collision scenerio with headset" into klp-wireless-dev

parents 99c06b6c 6f8aef98
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -4875,6 +4875,16 @@ void btm_sec_link_key_request (UINT8 *p_bda)
    BTM_TRACE_EVENT ("btm_sec_link_key_request()  BDA: %02x:%02x:%02x:%02x:%02x:%02x",
                      p_bda[0], p_bda[1], p_bda[2], p_bda[3], p_bda[4], p_bda[5]);

    if( (btm_cb.pairing_state == BTM_PAIR_STATE_WAIT_PIN_REQ) &&
        (btm_cb.collision_start_time != 0) &&
        (memcmp (btm_cb.p_collided_dev_rec->bd_addr, p_bda, BD_ADDR_LEN) == 0) )
    {
        BTM_TRACE_EVENT ("btm_sec_link_key_request() rejecting link key req "
            "State: %d START_TIMEOUT : %d",
             btm_cb.pairing_state, btm_cb.collision_start_time);
        btsnd_hcic_link_key_neg_reply (p_bda);
        return;
    }
    if (p_dev_rec->sec_flags & BTM_SEC_LINK_KEY_KNOWN)
    {
        btsnd_hcic_link_key_req_reply (p_bda, p_dev_rec->link_key);