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

Commit 53dde89c authored by Venkata Jagadeesh Garaga's avatar Venkata Jagadeesh Garaga Committed by Automerger Merge Worker
Browse files

SDP: Handle race condition in HID SDP am: 01b9c118 

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



Change-Id: I144431d2bbabd1c057a1d17a042a507f3ea4d7c9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 24b5dc75 01b9c118

system/stack/sdp/sdp_main.cc

+12 −13
Original line number Diff line number Diff line
@@ -257,17 +257,6 @@ static void sdp_disconnect_ind(uint16_t l2cap_cid, bool ack_needed) { 
    return;

  }



  if (ack_needed) {

    sdpu_process_pend_ccb(p_ccb->connection_id, false);

  } else {

    SDP_TRACE_WARNING(

        "SDP - Rcvd L2CAP disc, "

        "ACL disc clear pend sdp ccb: 0x%x",

        l2cap_cid);

    sdpu_clear_pend_ccb(p_ccb->connection_id);

  }



  SDP_TRACE_EVENT("SDP - Rcvd L2CAP disc, CID: 0x%x", l2cap_cid);

  /* Tell the user if there is a callback */

  if (p_ccb->p_cb)

    (*p_ccb->p_cb)(((p_ccb->con_state == SDP_STATE_CONNECTED)
@@ -279,6 +268,16 @@ static void sdp_disconnect_ind(uint16_t l2cap_cid, bool ack_needed) { 
                                                   : SDP_CONN_FAILED),

        p_ccb->user_data);



  if (ack_needed) {

    SDP_TRACE_WARNING("SDP - Rcvd L2CAP disc, process pend sdp ccb: 0x%x",

                      l2cap_cid);

    sdpu_process_pend_ccb(p_ccb->connection_id, false);

  } else {

    SDP_TRACE_WARNING("SDP - Rcvd L2CAP disc, clear pend sdp ccb: 0x%x",

                      l2cap_cid);

    sdpu_clear_pend_ccb(p_ccb->connection_id);

  }



  sdpu_release_ccb(p_ccb);

}
@@ -444,7 +443,6 @@ static void sdp_disconnect_cfm(uint16_t l2cap_cid, 


  SDP_TRACE_EVENT("SDP - Rcvd L2CAP disc cfm, CID: 0x%x", l2cap_cid);



  sdpu_process_pend_ccb(p_ccb->connection_id, false);

  /* Tell the user if there is a callback */

  if (p_ccb->p_cb)

    (*p_ccb->p_cb)(static_cast<tSDP_STATUS>(p_ccb->disconnect_reason));
@@ -452,6 +450,7 @@ static void sdp_disconnect_cfm(uint16_t l2cap_cid, 
    (*p_ccb->p_cb2)(static_cast<tSDP_STATUS>(p_ccb->disconnect_reason),

                    p_ccb->user_data);



  sdpu_process_pend_ccb(p_ccb->connection_id, false);

  sdpu_release_ccb(p_ccb);

}
@@ -472,12 +471,12 @@ void sdp_conn_timer_timeout(void* data) { 
                  p_ccb->connection_id);



  L2CA_DisconnectReq(p_ccb->connection_id);

  sdpu_clear_pend_ccb(p_ccb->connection_id);



  /* Tell the user if there is a callback */

  if (p_ccb->p_cb)

    (*p_ccb->p_cb)(SDP_CONN_FAILED);

  else if (p_ccb->p_cb2)

    (*p_ccb->p_cb2)(SDP_CONN_FAILED, p_ccb->user_data);

  sdpu_clear_pend_ccb(p_ccb->connection_id);

  sdpu_release_ccb(p_ccb);

}