commit b86bc49e6176787745524dd5f9283b882c224b88
author Treehugger Robot <treehugger-gerrit@google.com> Fri Nov 15 02:37:41 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 15 02:37:41 2019 +0000
tree 32d6f3a702dbb42124f98f0be32b29dceedfd490
parent acabe288d0192a30be279f7cb619f825a1f71bf2
parent dc04c5c3fbcc4d19d8551bd26bcf725c0679b05d

Merge "Skip SDP search with an empty service class id"

bta/dm/bta_dm_act.cc

diff --git a/bta/dm/bta_dm_act.cc b/bta/dm/bta_dm_act.cc
index 43befc2..91704a0 100644
--- a/bta/dm/bta_dm_act.cc
+++ b/bta/dm/bta_dm_act.cc
@@ -1357,8 +1357,10 @@
     do {
       p_sdp_rec = NULL;
       if (bta_dm_search_cb.service_index == (BTA_USER_SERVICE_ID + 1)) {
-        p_sdp_rec = SDP_FindServiceUUIDInDb(bta_dm_search_cb.p_sdp_db,
-                                            bta_dm_search_cb.uuid, p_sdp_rec);
+        if (!bta_dm_search_cb.uuid.IsEmpty()) {
+          p_sdp_rec = SDP_FindServiceUUIDInDb(bta_dm_search_cb.p_sdp_db,
+                                              bta_dm_search_cb.uuid, p_sdp_rec);
+        }
 
         if (p_sdp_rec && SDP_FindProtocolListElemInRec(
                              p_sdp_rec, UUID_PROTOCOL_RFCOMM, &pe)) {