commit cbeed50f714a3b15a7be86ba484a3c89a4b6e9d7
author Jakub Pawlowski <jpawlowski@google.com> Thu May 26 15:13:04 2016 -0700
committer Jakub Pawlowski <jpawlowski@google.com> Thu May 26 15:24:00 2016 -0700
tree d0608899fae40edced6125eba2503575e50a6db2
parent 0a0a7e96e7092f03a6dc568eb6358c6f4499e56a

Do not allow LE connection timeout smaller than 1s for HID devices

Bug: 28979841
Change-Id: I520608a13224601fb9101d00c08b34cdb0f8d374

bta/hh/bta_hh_le.c

diff --git a/bta/hh/bta_hh_le.c b/bta/hh/bta_hh_le.c
index 5d23d81..b44d86f 100644
--- a/bta/hh/bta_hh_le.c
+++ b/bta/hh/bta_hh_le.c
@@ -1756,6 +1756,9 @@
         if (max < BTM_BLE_CONN_INT_MIN_LIMIT)
             max = BTM_BLE_CONN_INT_MIN_LIMIT;
 
+        if (tout < BTM_BLE_CONN_TIMEOUT_MIN_DEF)
+            tout = BTM_BLE_CONN_TIMEOUT_MIN_DEF;
+
         BTM_BleSetPrefConnParams (p_dev_cb->addr, min, max, latency, tout);
         L2CA_UpdateBleConnParams(p_dev_cb->addr, min, max, latency, tout);
     }

stack/include/btm_ble_api.h

diff --git a/stack/include/btm_ble_api.h b/stack/include/btm_ble_api.h
index 92b8fda..bc66425 100644
--- a/stack/include/btm_ble_api.h
+++ b/stack/include/btm_ble_api.h
@@ -186,6 +186,11 @@
 #define BTM_BLE_CONN_TIMEOUT_DEF    2000
 #endif
 
+/* minimum supervision timeout */
+#ifndef BTM_BLE_CONN_TIMEOUT_MIN_DEF
+#define BTM_BLE_CONN_TIMEOUT_MIN_DEF    100
+#endif
+
 /* minimum acceptable connection interval */
 #ifndef BTM_BLE_CONN_INT_MIN_LIMIT
 #define BTM_BLE_CONN_INT_MIN_LIMIT     0x0009