diff options
author | Sudharma Damgatla <sudharma@codeaurora.org> | 2015-12-10 16:30:24 +0530 |
---|---|---|
committer | Sridhar Gujje <sgujje@codeaurora.org> | 2015-12-10 21:23:36 +0530 |
commit | 1265afd4c6574e0432cdadca6bde3b8a58740d46 (patch) | |
tree | cd584d23961ef2bd0fbb363632b814378525f894 /stack/sdp/sdp_api.c | |
parent | cc034991d31c3ad1cf9b9d44655dc256c6b68228 (diff) | |
parent | 3e8755eca7a61ac580a197697e0217e7c1681eb6 (diff) | |
download | android_system_bt-1265afd4c6574e0432cdadca6bde3b8a58740d46.tar.gz android_system_bt-1265afd4c6574e0432cdadca6bde3b8a58740d46.tar.bz2 android_system_bt-1265afd4c6574e0432cdadca6bde3b8a58740d46.zip |
git merge android-6.0.1_r3 on to remote branch
Change-Id: I501838b5f3f9d8bf60ab8df59a322a6f1e9199b9
Diffstat (limited to 'stack/sdp/sdp_api.c')
-rw-r--r-- | stack/sdp/sdp_api.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/stack/sdp/sdp_api.c b/stack/sdp/sdp_api.c index d96ace91d..720fad717 100644 --- a/stack/sdp/sdp_api.c +++ b/stack/sdp/sdp_api.c @@ -357,7 +357,8 @@ BOOLEAN SDP_FindServiceUUIDInRec(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) else if (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == LEN_UUID_128) { p_uuid->len = LEN_UUID_128; - memcpy(p_uuid->uu.uuid128, p_sattr->attr_value.v.array, LEN_UUID_128); + for (uint8_t i = 0; i != LEN_UUID_128; ++i) + p_uuid->uu.uuid128[i] = p_sattr->attr_value.v.array[LEN_UUID_128-i-1]; } else if (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == LEN_UUID_32) { @@ -443,8 +444,9 @@ BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) /* only support 128 bits UUID for now */ if (SDP_DISC_ATTR_LEN(p_sattr->attr_len_type) == 16) { - p_uuid->len = 16; - memcpy(p_uuid->uu.uuid128, p_sattr->attr_value.v.array, MAX_UUID_SIZE); + p_uuid->len = LEN_UUID_128; + for (uint8_t i = 0; i != LEN_UUID_128; ++i) + p_uuid->uu.uuid128[i] = p_sattr->attr_value.v.array[LEN_UUID_128-i-1]; } return(TRUE); } @@ -457,8 +459,9 @@ BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid) /* only support 128 bits UUID for now */ && (SDP_DISC_ATTR_LEN(p_attr->attr_len_type) == 16)) { - p_uuid->len = 16; - memcpy(p_uuid->uu.uuid128, p_attr->attr_value.v.array, MAX_UUID_SIZE); + p_uuid->len = LEN_UUID_128; + for (uint8_t i = 0; i != LEN_UUID_128; ++i) + p_uuid->uu.uuid128[i] = p_attr->attr_value.v.array[LEN_UUID_128-i-1]; return(TRUE); } } |