commit 17ec140b1ff7c9f76e580150804e94219feb1425
author Andre Eisenbach <eisenbach@google.com> Wed Feb 18 16:33:34 2015 -0800
committer Andre Eisenbach <eisenbach@google.com> Wed Feb 18 16:33:34 2015 -0800
tree b6301434167ec67f28846cf33f141e5215ffece6
parent dfb3b2f2595dc16fe7f576a4b0c2f5e73db0327f

Ignore service UUID length if no UUID filter is specified

Bug: 19016326
Change-Id: I6156fee1d6079fec7879f47b6120befe2c4d35cd

stack/sdp/sdp_api.c

diff --git a/stack/sdp/sdp_api.c b/stack/sdp/sdp_api.c
index 9b3628c..533b61b 100644
--- a/stack/sdp/sdp_api.c
+++ b/stack/sdp/sdp_api.c
@@ -526,10 +526,10 @@
 
                     }
 
-                    if ((SDP_DISC_ATTR_TYPE(p_sattr->attr_len_type) == UUID_DESC_TYPE)
-                        && (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == 2)
+                    if (SDP_DISC_ATTR_TYPE(p_sattr->attr_len_type) == UUID_DESC_TYPE && (service_uuid == 0
+                        || (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == 2
+                            && p_sattr->attr_value.v.u16 == service_uuid)))
                         /* for a specific uuid, or any one */
-                        && ((p_sattr->attr_value.v.u16 == service_uuid) || service_uuid == 0))
                     {
                         return(p_rec);
                     }