Increased the SDP DB size to 8K as there were devices whose number of

UUID attributes exceeded the current limit of 4K

Change-Id: I10dd833eb7ffcd42fb6ccb60318921296873be95

6 files changed, 12 insertions, 20 deletions

diff --git a/include/bdroid_crespo.txt b/include/bdroid_crespo.txt
index 42ff743..98691f2 100644
--- a/include/bdroid_crespo.txt
+++ b/include/bdroid_crespo.txt
@@ -86,7 +86,6 @@ SAP_INCLUDED = FALSE
 SBC_NO_PCM_CPY_OPTION = FALSE
 SBC_IPAQ_OPT = FALSE
 SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTE_HCIUTILS_HOOK_INCLUDED = FALSE
 BTA_INCLUDED = TRUE
 BTA_AG_INCLUDED = TRUE
 BTA_CT_INCLUDED = FALSE
@@ -187,7 +186,7 @@ BTAPP_FM_USE_HW_POKE_VOLUME = FALSE
 BTAPP_FM_AUDIO_PATH = BTA_FM_AUDIO_DAC
 BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK | BTA_NAP_SERVICE_MASK | BTA_PANU_SERVICE_MASK | BTA_HL_SERVICE_MASK)
 PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 4096
+BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
 FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
 HID_HOST_MAX_CONN_RETRY = (3)
diff --git a/include/bdroid_crespo4g.txt b/include/bdroid_crespo4g.txt
index 42ff743..98691f2 100644
--- a/include/bdroid_crespo4g.txt
+++ b/include/bdroid_crespo4g.txt
@@ -86,7 +86,6 @@ SAP_INCLUDED = FALSE
 SBC_NO_PCM_CPY_OPTION = FALSE
 SBC_IPAQ_OPT = FALSE
 SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTE_HCIUTILS_HOOK_INCLUDED = FALSE
 BTA_INCLUDED = TRUE
 BTA_AG_INCLUDED = TRUE
 BTA_CT_INCLUDED = FALSE
@@ -187,7 +186,7 @@ BTAPP_FM_USE_HW_POKE_VOLUME = FALSE
 BTAPP_FM_AUDIO_PATH = BTA_FM_AUDIO_DAC
 BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK | BTA_NAP_SERVICE_MASK | BTA_PANU_SERVICE_MASK | BTA_HL_SERVICE_MASK)
 PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 4096
+BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
 FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
 HID_HOST_MAX_CONN_RETRY = (3)
diff --git a/include/bdroid_maguro.txt b/include/bdroid_maguro.txt
index 73d95f4..83502c5 100644
--- a/include/bdroid_maguro.txt
+++ b/include/bdroid_maguro.txt
@@ -86,7 +86,6 @@ SAP_INCLUDED = FALSE
 SBC_NO_PCM_CPY_OPTION = FALSE
 SBC_IPAQ_OPT = FALSE
 SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTE_HCIUTILS_HOOK_INCLUDED = FALSE
 BTA_INCLUDED = TRUE
 BTA_AG_INCLUDED = TRUE
 BTA_CT_INCLUDED = FALSE
@@ -185,7 +184,7 @@ OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
 BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
 BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
 PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 4096
+BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
 FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
 HID_HOST_MAX_CONN_RETRY = (3)
diff --git a/include/bdroid_toro.txt b/include/bdroid_toro.txt
index a67c102..f1194d9 100644
--- a/include/bdroid_toro.txt
+++ b/include/bdroid_toro.txt
@@ -86,7 +86,6 @@ SAP_INCLUDED = FALSE
 SBC_NO_PCM_CPY_OPTION = FALSE
 SBC_IPAQ_OPT = FALSE
 SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTE_HCIUTILS_HOOK_INCLUDED = FALSE
 BTA_INCLUDED = TRUE
 BTA_AG_INCLUDED = TRUE
 BTA_CT_INCLUDED = FALSE
@@ -185,7 +184,7 @@ OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
 BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
 BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
 PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 4096
+BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
 FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
 HID_HOST_MAX_CONN_RETRY = (3)
diff --git a/include/bdroid_wingray.txt b/include/bdroid_wingray.txt
index 0f47374..07387ca 100644
--- a/include/bdroid_wingray.txt
+++ b/include/bdroid_wingray.txt
@@ -86,7 +86,6 @@ SAP_INCLUDED = FALSE
 SBC_NO_PCM_CPY_OPTION = FALSE
 SBC_IPAQ_OPT = FALSE
 SBC_IS_64_MULT_IN_QUANTIZER = FALSE
-BTE_HCIUTILS_HOOK_INCLUDED = FALSE
 BTA_INCLUDED = TRUE
 BTA_AG_INCLUDED = TRUE
 BTA_CT_INCLUDED = FALSE
@@ -185,7 +184,7 @@ OBX_INITIAL_TRACE_LEVEL = BT_TRACE_LEVEL_ERROR
 BTM_ALLOW_CONN_IF_NONDISCOVER = TRUE
 BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA_A2DP_SERVICE_MASK | BTA_HID_SERVICE_MASK | BTA_OPP_SERVICE_MASK | BTA_BPP_SERVICE_MASK)
 PBAP_ZERO_VCARD_IN_DB = FALSE
-BTA_DM_SDP_DB_SIZE = 4096
+BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
 FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
 HID_HOST_MAX_CONN_RETRY = (3)
diff --git a/include/gki_target.h b/include/gki_target.h
index 6430a81..d1541af 100644
--- a/include/gki_target.h
+++ b/include/gki_target.h
@@ -298,22 +298,19 @@ eL2CAP requires Pool ID 5
 If BTM_SCO_HCI_INCLUDED is FALSE, Pool ID 6 is unnecessary, otherwise set to 7 
 If BTA_HL_INCLUDED is FALSE then Pool ID 7 is uncessary and set the following to 7, otherwise set to 8
 If BLE_INCLUDED is FALSE then Pool ID 8 is uncessary and set the following to 8, otherwise set to 9
-If HCIUTILS_HOOK_INCLUDED is TRUE then Pool ID 9 is needed
+POOL_ID 9 is a public pool meant for large buffer needs such as SDP_DB
 */
 // btla-specific ++
 #ifndef GKI_NUM_FIXED_BUF_POOLS
-#if (defined(BTE_HCIUTILS_HOOK_INCLUDED) && (BTE_HCIUTILS_HOOK_INCLUDED == TRUE))
 #define GKI_NUM_FIXED_BUF_POOLS     10
-#else
-#define GKI_NUM_FIXED_BUF_POOLS     9
-#endif
 #endif
-// btla-specific --
 
 /* The buffer pool usage mask. */
 #ifndef GKI_DEF_BUFPOOL_PERM_MASK
-#define GKI_DEF_BUFPOOL_PERM_MASK   0xfff0
+/* Setting POOL_ID 9 as a public pool meant for large buffers such as SDP_DB */
+#define GKI_DEF_BUFPOOL_PERM_MASK   0xfdf0
 #endif
+// btla-specific --
 
 /* The number of fixed and dynamic buffer pools */
 #ifndef GKI_NUM_TOTAL_BUF_POOLS
@@ -441,17 +438,17 @@ over HCI data and intentionally kept out of order */
 #endif
 
 // btla-specific ++
-/* The following pool is a dedicated pool for HCIUTILS */
+/* The following pool is  meant for large allocations such as SDP_DB */
 #ifndef GKI_POOL_ID_9
 #define GKI_POOL_ID_9              9
 #endif
 
 #ifndef GKI_BUF9_SIZE
-#define GKI_BUF9_SIZE            256
+#define GKI_BUF9_SIZE            8192
 #endif
 
 #ifndef GKI_BUF9_MAX
-#define GKI_BUF9_MAX           250
+#define GKI_BUF9_MAX           5
 #endif
 // btla-specific --