commit 6cab953d1b6df0a93630d3c8aa1c351932a6df44
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 23:10:08 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Wed Apr 06 23:10:08 2022 +0000
tree 09313c256b3a38c8aa253e6322d6ec463a4df364
parent a150bf1019974cbaa9bae531a1eb5bc7e1d252ec
parent 7606c6e2d4e23e122e7a77d238b388f447c16a39

Snap for 8412755 from 7606c6e2d4e23e122e7a77d238b388f447c16a39 to sc-qpr3-release

Change-Id: I857078dbb2d25b005e8f5c2ca9a3a0f828017806

stack/gatt/gatt_sr.cc

diff --git a/stack/gatt/gatt_sr.cc b/stack/gatt/gatt_sr.cc
index 9fe642c..0396bb1 100644
--- a/stack/gatt/gatt_sr.cc
+++ b/stack/gatt/gatt_sr.cc
@@ -173,6 +173,9 @@
 
     if (p_rsp != NULL) {
       total_len = (p_buf->len + p_rsp->attr_value.len);
+      if (p_cmd->multi_req.variable_len) {
+        total_len += 2;
+      }
 
       if (total_len > mtu) {
         /* just send the partial response for the overflow case */