diff options
| author | Justin Harrison <astyrrian@google.com> | 2015-02-19 05:01:24 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-19 05:01:24 +0000 |
| commit | 7f0bed2474013b96357cf5c499e9b6dbae47c406 (patch) | |
| tree | 423bd9faca6984f68de6fd22a7b741c2bc8a142b /stack/sdp/sdp_api.c | |
| parent | f3815f98c16716b14b2fab5820e52e9907eb8cc4 (diff) | |
| parent | 45085bf6ed93ea9398047c21bc4b94c8516f9daa (diff) | |
| download | android_system_bt-7f0bed2474013b96357cf5c499e9b6dbae47c406.tar.gz android_system_bt-7f0bed2474013b96357cf5c499e9b6dbae47c406.tar.bz2 android_system_bt-7f0bed2474013b96357cf5c499e9b6dbae47c406.zip | |
am 45085bf6: Merge "Ignore service UUID length if no UUID filter is specified" into lmp-mr1-dev
* commit '45085bf6ed93ea9398047c21bc4b94c8516f9daa':
Ignore service UUID length if no UUID filter is specified
Diffstat (limited to 'stack/sdp/sdp_api.c')
| -rw-r--r-- | stack/sdp/sdp_api.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stack/sdp/sdp_api.c b/stack/sdp/sdp_api.c index 024a7bdc8..558bd8b69 100644 --- a/stack/sdp/sdp_api.c +++ b/stack/sdp/sdp_api.c @@ -526,10 +526,10 @@ tSDP_DISC_REC *SDP_FindServiceInDb (tSDP_DISCOVERY_DB *p_db, UINT16 service_uuid } - 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); } |