Commit: 28523075a6fa24ddea8c5f4a35fa13bbc684a23f - system-bt (git)

system/bt

Commit MetaInfo

• Revisión: 28523075a6fa24ddea8c5f4a35fa13bbc684a23f (tree)
• Tiempo: 2019-12-03 10:06:32
• Autor: Automerger Merge Worker <android-build-automerger-merge-worker@syst...>
• Commiter: Automerger Merge Worker

Log Message

Merge "GAP: Correct the continuous pkt length in l2cap" into oc-dev am: 2a8a9b22f2 am: 5d8fde3e01 am: 5dbe08152a am: 294e64950c

Change-Id: I69396f7e01601ac6298b7a626268e96c1538dea0

Cambiar Resumen

• modified: hci/src/packet_fragmenter.cc

Diferencia incremental

--- a/hci/src/packet_fragmenter.cc
+++ b/hci/src/packet_fragmenter.cc
@@ -221,7 +221,8 @@ static void reassemble_and_dispatch(UNUSED_ATTR BT_HDR* packet) {
                  "%s got packet which would exceed expected length of %d. "
                  "Truncating.",
                  __func__, partial_packet->len);
-        packet->len = partial_packet->len - partial_packet->offset;
+        packet->len =
+            (partial_packet->len - partial_packet->offset) + packet->offset;
         projected_offset = partial_packet->len;
       }