Skip to content
Snippets Groups Projects
Commit 6cfc3499 authored by Mohammad Hasan Keramat J's avatar Mohammad Hasan Keramat J :homes:
Browse files

Merge tag 'android-14.0.0_r25' of...

Merge tag 'android-14.0.0_r25' of https://android.googlesource.com/platform/packages/modules/Bluetooth

 into fourteen

Android 14.0.0 Release 25 (UQ1A.240205.004)

Change-Id: Ia67e310ff420ccca525e2a59728e94f8f795c1a6
Signed-off-by: default avatarMohammad Hasan Keramat J <ikeramat@protonmail.com>
parents 3c2d6027 cde0b1f5
No related branches found
No related tags found
No related merge requests found
......@@ -18,6 +18,8 @@
#define LOG_TAG "bt_btif_gatt"
#include <algorithm>
#include "btif_gatt_util.h"
#include <errno.h>
......@@ -52,9 +54,9 @@ using bluetooth::Uuid;
void btif_to_bta_response(tGATTS_RSP* p_dest, btgatt_response_t* p_src) {
p_dest->attr_value.auth_req = p_src->attr_value.auth_req;
p_dest->attr_value.handle = p_src->attr_value.handle;
p_dest->attr_value.len = p_src->attr_value.len;
p_dest->attr_value.len = std::min<uint16_t>(p_src->attr_value.len, GATT_MAX_ATTR_LEN);
p_dest->attr_value.offset = p_src->attr_value.offset;
memcpy(p_dest->attr_value.value, p_src->attr_value.value, GATT_MAX_ATTR_LEN);
memcpy(p_dest->attr_value.value, p_src->attr_value.value, p_dest->attr_value.len);
}
/*******************************************************************************
......
......@@ -165,7 +165,13 @@ static BT_HDR* attp_build_read_by_type_value_cmd(
uint16_t payload_size, tGATT_FIND_TYPE_VALUE* p_value_type) {
uint8_t* p;
uint16_t len = p_value_type->value_len;
BT_HDR* p_buf =
BT_HDR* p_buf = nullptr;
if (payload_size < 5) {
return nullptr;
}
p_buf =
(BT_HDR*)osi_malloc(sizeof(BT_HDR) + payload_size + L2CAP_MIN_OFFSET);
p = (uint8_t*)(p_buf + 1) + L2CAP_MIN_OFFSET;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment