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

Commit 12e3b0c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "stack::sdp [2/12] service.SDP_CancelServiceSearch" into main

parents fd47f81c f3ca5628

system/bta/ag/bta_ag_act.cc

+5 −2
Original line number Diff line number Diff line
@@ -905,8 +905,11 @@ void bta_ag_handle_collision(tBTA_AG_SCB* p_scb, 
                             const tBTA_AG_DATA& /* data */) {

  /* Cancel SDP if it had been started. */

  if (p_scb->p_disc_db) {

    get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(

        p_scb->p_disc_db);

    if (!get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(

            p_scb->p_disc_db)) {

      log::warn("Unable to cancel SDP service discovery search peer:{}",

                p_scb->peer_addr);

    }

    bta_ag_free_db(p_scb, tBTA_AG_DATA::kEmpty);

  }

system/bta/hf_client/bta_hf_client_main.cc

+4 −2
Original line number Diff line number Diff line
@@ -389,8 +389,10 @@ void bta_hf_client_collision_cback(tBTA_SYS_CONN_STATUS /* status */, 


    /* Cancel SDP if it had been started. */

    if (client_cb->p_disc_db) {

      get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(

          client_cb->p_disc_db);

      if (!get_legacy_stack_sdp_api()->service.SDP_CancelServiceSearch(

              client_cb->p_disc_db)) {

        log::warn("Unable to cancel SDP service discovery peer:{}", peer_addr);

      }

      osi_free_and_reset((void**)&client_cb->p_disc_db);

    }