diff options
| author | Myles Watson <mylesgw@google.com> | 2020-12-03 18:54:14 -0800 |
|---|---|---|
| committer | Myles Watson <mylesgw@google.com> | 2020-12-10 19:29:20 +0000 |
| commit | f0994f6e4723eddaa617b68139f064d945d9389e (patch) | |
| tree | 1ddfb9778ac0a1d583cf8c322bbc00e6d1cc310d | |
| parent | 27feab80ac0aa4bff5318e795629351488ee00bd (diff) | |
| download | bt-f0994f6e4723eddaa617b68139f064d945d9389e.tar.gz | |
SDP: Only start discovery once
Bug: 174052148
Test: pair with headphones
Tag: #security
Change-Id: I1d014a7b793bb1b66e26652f6696499ea36a6510
(cherry picked from commit cfa5a74ea90a09e1c7413a25f04332ee2d1e3f21)
Merged-In: I1d014a7b793bb1b66e26652f6696499ea36a6510
| -rw-r--r-- | bta/ag/bta_ag_sdp.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/bta/ag/bta_ag_sdp.cc b/bta/ag/bta_ag_sdp.cc index ae3c97391..a56f54e08 100644 --- a/bta/ag/bta_ag_sdp.cc +++ b/bta/ag/bta_ag_sdp.cc @@ -31,6 +31,7 @@ #include "bta_api.h" #include "bta_sys.h" #include "btm_api.h" +#include "osi/include/log.h" #include "osi/include/osi.h" #include "sdp_api.h" #include "utl.h" @@ -419,6 +420,12 @@ void bta_ag_do_disc(tBTA_AG_SCB* p_scb, tBTA_SERVICE_MASK service) { return; } + 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 */ |