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

Commit 20800b9e authored by Jakub Pawłowski's avatar Jakub Pawłowski Committed by Automerger Merge Worker
Browse files

Merge "Fix L2CAP PTS issue" am: 95ad20ba am: 719a1009 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2238053



Change-Id: Ia720c23b241f26d8d39a5b3585a421e9e1aa4b60
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4227e342 719a1009

system/stack/gap/gap_conn.cc

+3 −1
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ static tGAP_CCB* gap_allocate_ccb(void); 
static void gap_release_ccb(tGAP_CCB* p_ccb);

static void gap_checks_con_flags(tGAP_CCB* p_ccb);



extern bool BTM_UseLeLink(const RawAddress& bd_addr);



/*******************************************************************************

 *

 * Function         gap_conn_init
@@ -620,7 +622,7 @@ static void gap_connect_ind(const RawAddress& bd_addr, uint16_t l2cap_cid, 
    LOG(WARNING) << "*******";



    /* Disconnect because it is an unexpected connection */

    if (p_ccb->transport == BT_TRANSPORT_LE) {

    if (BTM_UseLeLink(bd_addr)) {

      L2CA_DisconnectLECocReq(l2cap_cid);

    } else {

      L2CA_DisconnectReq(l2cap_cid);