Revert "Update Interop datatbase to prevent preferred conn updates"

This reverts commit 6932707ba3df2d3e42e7ecd10ae71086e5b4674f.

Change-Id: I2c636fe05b670aabef51367e36d1c7bfd7c1c26c

7 files changed, 2 insertions, 73 deletions

diff --git a/bta/hh/bta_hh_le.c b/bta/hh/bta_hh_le.c
index 1e9f844dc..28d3897c0 100644
--- a/bta/hh/bta_hh_le.c
+++ b/bta/hh/bta_hh_le.c
@@ -31,7 +31,6 @@
 #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"
@@ -1833,7 +1832,6 @@ 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);
@@ -1875,12 +1873,7 @@ 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);
-
-        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);
-        }
+        L2CA_UpdateBleConnParams(p_dev_cb->addr, min, max, latency, tout);
     }
     else
     {
diff --git a/device/include/interop.h b/device/include/interop.h
index 8dfd3f74d..fa49c09e5 100644
--- a/device/include/interop.h
+++ b/device/include/interop.h
@@ -97,11 +97,6 @@ typedef enum {
   //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,
-
   // Few remote devices do not understand AVRCP version greater than 1.3. For these
   // devices, we would like to blacklist them and advertise AVRCP version as 1.3
   INTEROP_ADV_AVRCP_VER_1_3,
diff --git a/device/include/interop_database.h b/device/include/interop_database.h
index c941d89b4..226e9f0fb 100644
--- a/device/include/interop_database.h
+++ b/device/include/interop_database.h
@@ -157,10 +157,6 @@ 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},
-
   // HID Moto KZ500 Keyboard - Problematic SDP digitizer descriptor
   {"Motorola Keyboard KZ500", 23, INTEROP_REMOVE_HID_DIG_DESCRIPTOR},
   {"Motorola Keyboard KZ500 v122", 28, INTEROP_REMOVE_HID_DIG_DESCRIPTOR},
diff --git a/device/src/interop.c b/device/src/interop.c
index 49fb3252b..12826b7b7 100644
--- a/device/src/interop.c
+++ b/device/src/interop.c
@@ -154,7 +154,6 @@ 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)
     CASE_RETURN_STR(INTEROP_ADV_AVRCP_VER_1_3)
   }
 
diff --git a/stack/btm/btm_ble.c b/stack/btm/btm_ble.c
index d068f0567..d6d8d6045 100644
--- a/stack/btm/btm_ble.c
+++ b/stack/btm/btm_ble.c
@@ -33,7 +33,6 @@
 
 #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"
@@ -121,37 +120,6 @@ 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
@@ -2773,7 +2741,6 @@ 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 */
diff --git a/stack/include/btm_ble_api.h b/stack/include/btm_ble_api.h
index 43a015dcf..ab5ea38b1 100644
--- a/stack/include/btm_ble_api.h
+++ b/stack/include/btm_ble_api.h
@@ -1861,20 +1861,6 @@ 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
diff --git a/stack/l2cap/l2c_ble.c b/stack/l2cap/l2c_ble.c
index 93a3f0fd9..4b8d56a58 100644
--- a/stack/l2cap/l2c_ble.c
+++ b/stack/l2cap/l2c_ble.c
@@ -31,7 +31,6 @@
 #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)
@@ -284,7 +283,6 @@ 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)
     {
@@ -304,12 +302,7 @@ void l2cble_notify_le_connection (BD_ADDR 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);
-    }
+    l2cble_use_preferred_conn_params(bda);
 }
 
 /*******************************************************************************