diff options
| author | Justin Harrison <astyrrian@google.com> | 2015-02-19 04:48:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-19 04:48:38 +0000 |
| commit | 5cf3d3a7e5aee8db8d90dd1dc334df1fd2c56416 (patch) | |
| tree | 0256ef007593c7108e949748e7906b53a39b0339 | |
| parent | f6225e397f0632e3078b873019221e2f98810933 (diff) | |
| parent | 45085bf6ed93ea9398047c21bc4b94c8516f9daa (diff) | |
| download | bluedroid-lollipop-mr1-wfc-release.tar.gz | |
am 45085bf6: Merge "Ignore service UUID length if no UUID filter is specified" into lmp-mr1-devandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-release
* commit '45085bf6ed93ea9398047c21bc4b94c8516f9daa':
Ignore service UUID length if no UUID filter is specified
| -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 9b3628c..533b61b 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); } |