commit c8a9f438cd994a7e69aa7fa957e0b9139bfdb912
author Priti Aghera <paghera@broadcom.com> Wed May 22 13:25:58 2013 -0700
committer Matthew Xie <mattx@google.com> Fri Aug 30 11:41:07 2013 -0700
tree 21637fa81ee1cee5fb207c4b2010293c5d96f256
parent 247c68fe6eee3660cbdcf4509195fe735ae25573

Incremented buffer size to accomodate default MTU

L2CAP Config request was not sent from Bluedroid as the MTU size was
higher than the max buffer size for default apdu tx/rx sizes.
Incremented the buffer size to accomodate this default MTU size. Also
included new datatypes and corresponding tx/rx apdus. This will set the
MTU size to that defined in datatype config rather than selecting
default value.
b/10565872
Change-Id: Id469c836581fb3d020bcb88c381421e0ef965073

btif/include/btif_hl.h

diff --git a/btif/include/btif_hl.h b/btif/include/btif_hl.h
index 6544096..c4d8e81 100644
--- a/btif/include/btif_hl.h
+++ b/btif/include/btif_hl.h
@@ -30,6 +30,11 @@
 #define BTIF_HL_DATA_TYPE_BODY_WEIGHT_SCALE  0x100F
 #define BTIF_HL_DATA_TYPE_GLUCOSE_METER      0x1011
 #define BTIF_HL_DATA_TYPE_STEP_COUNTER       0x1068
+#define BTIF_HL_DATA_TYPE_BCA                0x1014
+#define BTIF_HL_DATA_TYPE_PEAK_FLOW          0x1015
+#define BTIF_HL_DATA_TYPE_CARDIO             0x1029
+#define BTIF_HL_DATA_TYPE_ACTIVITY_HUB       0x1047
+#define BTIF_HL_DATA_TYPE_AMM                0x1048
 
 #define BTIF_HL_CCH_NUM_FILTER_ELEMS            3
 #define BTIF_HL_APPLICATION_NAME_LEN          512

btif/src/btif_hl.c

diff --git a/btif/src/btif_hl.c b/btif/src/btif_hl.c
index a2fdbff..28a1461 100644
--- a/btif/src/btif_hl.c
+++ b/btif/src/btif_hl.c
@@ -147,7 +147,11 @@
     {BTIF_HL_DATA_TYPE_BODY_THERMOMETER,    896,    224},
     {BTIF_HL_DATA_TYPE_BODY_WEIGHT_SCALE,   896,    224},
     {BTIF_HL_DATA_TYPE_GLUCOSE_METER,       896,    224},
-    {BTIF_HL_DATA_TYPE_STEP_COUNTER,        6624,   224}
+    {BTIF_HL_DATA_TYPE_STEP_COUNTER,        6624,   224},
+    {BTIF_HL_DATA_TYPE_BCA,                 7730,   1230},
+    {BTIF_HL_DATA_TYPE_PEAK_FLOW    ,       2030,   224},
+    {BTIF_HL_DATA_TYPE_ACTIVITY_HUB,        5120,   224},
+    {BTIF_HL_DATA_TYPE_AMM,                 1024,   64}
 };
 
 #define BTIF_HL_DATA_TABLE_SIZE  (sizeof(data_type_table) / sizeof(btif_hl_data_type_cfg_t))

include/gki_target.h

diff --git a/include/gki_target.h b/include/gki_target.h
index d2a4c48..cdd7726 100644
--- a/include/gki_target.h
+++ b/include/gki_target.h
@@ -356,7 +356,7 @@
 
 /* The size of the buffers in pool 7 */
 #ifndef GKI_BUF7_SIZE
-#define GKI_BUF7_SIZE               9472
+#define GKI_BUF7_SIZE               (10240 + 24)
 #endif
 
 /* The number of buffers in buffer pool 7. */