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

Commit 0f6776ab authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [13320072, 13319971, 13320351, 13320073, 13320352,... 

Merge cherrypicks of [13320072, 13319971, 13320351, 13320073, 13320352, 13320131, 13320074, 13320075, 13321410, 13320132, 13319972, 13320076, 13320077, 13320353, 13320354] into rvc-qpr2-release

Change-Id: I66371f95d81b69b7e54ac9a45bcb859f3662ec53
parents c92b1569 96c90d0a

system/bta/ag/bta_ag_sdp.cc

+7 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "bta_sys.h"

#include "btif_config.h"

#include "btm_api.h"

#include "osi/include/log.h"

#include "osi/include/osi.h"

#include "sdp_api.h"

#include "stack/include/btu.h"
@@ -477,6 +478,12 @@ void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { 
    }

  }



  if (p_scb->p_disc_db != nullptr) {

    android_errorWriteLog(0x534e4554, "174052148");

    APPL_TRACE_ERROR("Discovery already in progress... returning.");

    return;

  }



  /* allocate buffer for sdp database */

  p_scb->p_disc_db = (tSDP_DISCOVERY_DB*)osi_malloc(BTA_AG_DISC_BUF_SIZE);

  /* set up service discovery database; attr happens to be attr_list len */