Commit: d3974ad35223794c79434d9c74074a8791a286c4 - system-bt (git)

system/bt

Commit MetaInfo

• Revision: d3974ad35223794c79434d9c74074a8791a286c4 (tree)
• Time: 2016-10-03 18:36:45
• Author: Linux Build Service Account <lnxbuild@loca...>
• Commiter: Gerrit - the friendly Code Review server

Log Message

Merge "Update Interop datatbase to prevent preferred conn updates" into bt.lnx.2.1-dev

Change Summary

• modified: bta/hh/bta_hh_le.c
• modified: device/include/interop.h
• modified: device/include/interop_database.h
• modified: device/src/interop.c
• modified: stack/btm/btm_ble.c
• modified: stack/include/btm_ble_api.h
• modified: stack/l2cap/l2c_ble.c

Incremental Difference

--- a/bta/hh/bta_hh_le.c
+++ b/bta/hh/bta_hh_le.c
@@ -31,6 +31,7 @@
 #include "btm_api.h"
 #include "btm_ble_api.h"
 #include "btm_int.h"
+#include "device/include/interop.h"
 #include "osi/include/log.h"
 #include "srvc_api.h"
 #include "stack/include/l2c_api.h"
@@ -1736,6 +1737,7 @@ void bta_hh_w4_le_read_char_cmpl(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_DATA *p_buf)
 {
     tBTA_GATTC_READ     * p_data = (tBTA_GATTC_READ *)p_buf;
     UINT8               *pp ;
+    BD_NAME             bdname;
 
     const tBTA_GATTC_CHARACTERISTIC *p_char = BTA_GATTC_GetCharacteristic(p_dev_cb->conn_id,
                                                                           p_data->handle);
@@ -1766,7 +1768,12 @@ void bta_hh_w4_le_read_char_cmpl(tBTA_HH_DEV_CB *p_dev_cb, tBTA_HH_DATA *p_buf)
             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);
+
+        if (!BTM_GetRemoteDeviceName(p_dev_cb->addr, bdname) || !*bdname ||
+        (!interop_match_name(INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS, (const char*) bdname)))
+        {
+            L2CA_UpdateBleConnParams(p_dev_cb->addr, min, max, latency, tout);
+        }
     }
     else
     {

--- a/device/include/interop.h
+++ b/device/include/interop.h
@@ -96,6 +96,11 @@ typedef enum {
   //Few carkits take long time to start sending AT commands
   //Increase AG_CONN TIMEOUT so that AG connection go through
   INTEROP_INCREASE_AG_CONN_TIMEOUT,
+
+  // Some HOGP devices do not respond well when we switch from default LE conn parameters
+  // to preferred conn params immediately post connection. Disable automatic switching to
+  // preferred conn params for such devices and allow them to explicity ask for it.
+  INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS,
 } interop_feature_t;
 
 // Check if a given |addr| matches a known interoperability workaround as identified

--- a/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@ -149,6 +149,10 @@ static const interop_name_entry_t interop_name_database[] = {
 
   // HID Authentication Blacklist
   {"Targus BT Laser Notebook Mouse", 30, INTEROP_DISABLE_AUTH_FOR_HID_POINTING},
+
+  //Below devices reject connection updated with preferred
+  {"BSMBB09DS", 9, INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS},
+  {"ELECOM", 6, INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS},
 };
 
 typedef struct {

--- a/device/src/interop.c
+++ b/device/src/interop.c
@@ -159,6 +159,7 @@ static const char* interop_feature_string_(const interop_feature_t feature) {
     CASE_RETURN_STR(INTEROP_REMOVE_HID_DIG_DESCRIPTOR)
     CASE_RETURN_STR(INTEROP_DISABLE_SNIFF_DURING_SCO)
     CASE_RETURN_STR(INTEROP_INCREASE_AG_CONN_TIMEOUT)
+    CASE_RETURN_STR(INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS)
   }
 
   return "UNKNOWN";

--- a/stack/btm/btm_ble.c
+++ b/stack/btm/btm_ble.c
@@ -33,6 +33,7 @@
 
 #include "bt_types.h"
 #include "bt_utils.h"
+#include "btif/include/btif_storage.h"
 #include "btm_ble_api.h"
 #include "btm_int.h"
 #include "btu.h"
@@ -124,6 +125,37 @@ BOOLEAN BTM_SecAddBleDevice (BD_ADDR bd_addr, BD_NAME bd_name, tBT_DEVICE_TYPE d
 
 /*******************************************************************************
 **
+** Function         BTM_GetRemoteDeviceName
+**
+** Description      This function is called to get the dev name of remote device
+**                  from NV
+**
+** Returns          TRUE if success; otherwise failed.
+**
+*******************************************************************************/
+BOOLEAN BTM_GetRemoteDeviceName(BD_ADDR bda, BD_NAME bd_name)
+{
+    BTM_TRACE_DEBUG("%s", __func__);
+    BOOLEAN ret = FALSE;
+    bt_bdname_t bdname;
+    bt_property_t prop_name;
+    bt_bdaddr_t bd_addr;
+    bdcpy(bd_addr.address, bda);
+
+    BTIF_STORAGE_FILL_PROPERTY(&prop_name, BT_PROPERTY_BDNAME,
+                          sizeof(bt_bdname_t), &bdname);
+    if (btif_storage_get_remote_device_property(
+        &bd_addr, &prop_name) == BT_STATUS_SUCCESS)
+    {
+        APPL_TRACE_DEBUG("%s, NV name = %s", __func__, bdname.name);
+        strlcpy((char*) bd_name, (char*) bdname.name, BD_NAME_LEN);
+        ret = TRUE;
+    }
+    return ret;
+}
+
+/*******************************************************************************
+**
 ** Function         BTM_SecAddBleKey
 **
 ** Description      Add/modify LE device information.  This function will be
@@ -2745,6 +2777,7 @@ void btm_ble_set_keep_rfu_in_auth_req(BOOLEAN keep_rfu)
     btm_cb.devcb.keep_rfu_in_auth_req = keep_rfu;
 }
 
+
 #endif /* BTM_BLE_CONFORMANCE_TESTING */
 
 #endif /* BLE_INCLUDED */

--- a/stack/include/btm_ble_api.h
+++ b/stack/include/btm_ble_api.h
@@ -1861,6 +1861,20 @@ extern tBTM_STATUS BTM_BleGetEnergyInfo(tBTM_BLE_ENERGY_INFO_CBACK *p_ener_cback
 *******************************************************************************/
 extern tBTM_STATUS BTM_SetBleDataLength(BD_ADDR bd_addr, UINT16 tx_pdu_length);
 
+
+
+/*******************************************************************************
+**
+** Function         BTM_GetRemoteDeviceName
+**
+** Description      This function is called to get the dev name of remote device
+**                  from NV
+**
+** Returns          TRUE if success; otherwise failed.
+**
+*******************************************************************************/
+extern BOOLEAN BTM_GetRemoteDeviceName(BD_ADDR bda, BD_NAME bdname);
+
 #ifdef __cplusplus
 }
 #endif

--- a/stack/l2cap/l2c_ble.c
+++ b/stack/l2cap/l2c_ble.c
@@ -31,6 +31,7 @@
 #include "btm_int.h"
 #include "hcimsgs.h"
 #include "device/include/controller.h"
+#include "device/include/interop.h"
 #include "stack_config.h"
 
 #if (BLE_INCLUDED == TRUE)
@@ -283,6 +284,7 @@ void l2cble_notify_le_connection (BD_ADDR bda)
     tL2C_LCB *p_lcb = l2cu_find_lcb_by_bd_addr (bda, BT_TRANSPORT_LE);
     tACL_CONN *p_acl = btm_bda_to_acl(bda, BT_TRANSPORT_LE) ;
     tL2C_CCB *p_ccb;
+    BD_NAME bdname;
 
     if (p_lcb != NULL && p_acl != NULL && p_lcb->link_state != LST_CONNECTED)
     {
@@ -305,7 +307,12 @@ void l2cble_notify_le_connection (BD_ADDR bda)
             l2c_csm_execute (p_ccb, L2CEVT_LP_CONNECT_CFM, NULL);
     }
 
-    l2cble_use_preferred_conn_params(bda);
+
+    if (!BTM_GetRemoteDeviceName(bda, bdname) || !*bdname ||
+        (!interop_match_name(INTEROP_DISABLE_LE_CONN_PREFERRED_PARAMS, (const char*) bdname)))
+    {
+        l2cble_use_preferred_conn_params(bda);
+    }
 }
 
 /*******************************************************************************