commit 19c4e3cde305448d262a13dc3f7e2a0adf27699f
author android-build-team Robot <android-build-team-robot@google.com> Sun Apr 15 07:21:16 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sun Apr 15 07:21:16 2018 +0000
tree 27f2ff431e3f4b014318874b2e715db5d4a50a6f
parent 4c4d7b7906853e606a6016cc8b2e17faf7b8c41b
parent 8f77663ddb959ef51f470ba0127a664767a9f455

Snap for 4722539 from 8f77663ddb959ef51f470ba0127a664767a9f455 to pi-release

Change-Id: I02d6fb2635e49b17b83b1cf7d5dbdee6b6f048d4

src/nfc/nfc/nfc_ncif.cc

diff --git a/src/nfc/nfc/nfc_ncif.cc b/src/nfc/nfc/nfc_ncif.cc
index 42aad5c..4fb767f 100644
--- a/src/nfc/nfc/nfc_ncif.cc
+++ b/src/nfc/nfc/nfc_ncif.cc
@@ -1572,7 +1572,10 @@
         << StringPrintf("nfc_ncif_proc_data len:%d", len);
 
     p_msg->layer_specific = 0;
-    if (pbf) p_msg->layer_specific = NFC_RAS_FRAGMENTED;
+    if (pbf) {
+      NFC_SetReassemblyFlag(true);
+      p_msg->layer_specific = NFC_RAS_FRAGMENTED;
+    }
     p_last = (NFC_HDR*)GKI_getlast(&p_cb->rx_q);
     if (p_last && (p_last->layer_specific & NFC_RAS_FRAGMENTED)) {
       /* last data buffer is not last fragment, append this new packet to the