summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPradeep Panigrahi <pradeepp@codeaurora.org>2015-11-03 13:29:55 +0530
committerGerrit - the friendly Code Review server <code-review@localhost>2015-11-05 06:00:29 -0800
commit957677e7abeb9f5cd9f76ff944722ce634c45e0d (patch)
treebf1574314b8ab597ed032bbbab72eac0ef5ce199
parent0e3889d76e8b1c6156835e818f1eec41397796e5 (diff)
downloadandroid_system_bt-957677e7abeb9f5cd9f76ff944722ce634c45e0d.tar.gz
android_system_bt-957677e7abeb9f5cd9f76ff944722ce634c45e0d.tar.bz2
android_system_bt-957677e7abeb9f5cd9f76ff944722ce634c45e0d.zip
Prevents rejection of valid max connection interval parameter update requests
Min connection interval is updated to BTM_BLE_CONN_INT_LIMIT(11.25 ms) if the requested min is < 11.25 ms. The L2CAP connection update request is rejected if max connection interval requested is < 11.25 ms since max connection interval becomes less than the min connection interval (11.25 ms) in the host logic in l2cble_process_sig_cmd fucntion. Hence, max connection interval parameter requests with 7.5 ms are rejected currently. CRs-fixed: 934966 Change-Id: I59afb07c9f8c1eb4cb1fc4c938710ec24761debb
-rw-r--r--stack/l2cap/l2c_ble.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/stack/l2cap/l2c_ble.c b/stack/l2cap/l2c_ble.c
index e2990c6e8..92c8f03fd 100644
--- a/stack/l2cap/l2c_ble.c
+++ b/stack/l2cap/l2c_ble.c
@@ -1019,6 +1019,9 @@ void l2cble_process_sig_cmd (tL2C_LCB *p_lcb, UINT8 *p, UINT16 pkt_len)
if (min_interval < BTM_BLE_CONN_INT_MIN_LIMIT)
min_interval = BTM_BLE_CONN_INT_MIN_LIMIT;
+ if (max_interval < BTM_BLE_CONN_INT_MIN_LIMIT)
+ max_interval = BTM_BLE_CONN_INT_MIN_LIMIT;
+
if (min_interval < BTM_BLE_CONN_INT_MIN || min_interval > BTM_BLE_CONN_INT_MAX ||
max_interval < BTM_BLE_CONN_INT_MIN || max_interval > BTM_BLE_CONN_INT_MAX ||
latency > BTM_BLE_CONN_LATENCY_MAX ||