提交: f3be84555a575f8ab6089a54df927364231972e3 - system-bt (git)

system/bt

Commit MetaInfo

• 修訂: f3be84555a575f8ab6089a54df927364231972e3 (tree)
• 時間: 2016-10-04 03:14:07
• 作者: Linux Build Service Account <lnxbuild@loca...>
• Commiter: Linux Build Service Account

Log Message

Promotion of bt.lnx.2.1-00018.

CRs Change ID Subject

---

1066335 Ic96205b5c304acb44eab53f4e2cb150726643bda BT: Serialize stack shutdown, state change callback and
1063890 I9afb5fec10a23725126e472c84b573dcdeacbfe0 BT: Calling HCI reset when Hardware error event occurs
1066796 I29bb6ae17dc5a83459cc5cd4c8cfc6ae59bb4504 GAP : PIN popup shown for dead legacy remotes
1070434 Ib4e8494270cea976d4549e903e78ec8b3398ec39 BT: Changing l2cap sock mutex lock type to static.
1071866 Bluetooth: split-a2dp: APTx-HD support
1068541 Ic3be9669c7cad52e0282a9947313659ef9056a02 Update Interop datatbase to prevent preferred conn updat

Change-Id: Idfe2fb86d32554d9f3ec4582d0f8611655e6a203
CRs-Fixed: 1066796, 1071866, 1070434, 1068541, 1063890, 1066335

Change Summary

• modified: audio_a2dp_hw/bthost_ipc.c
• modified: bta/av/bta_av_main.c
• modified: bta/hh/bta_hh_le.c
• modified: btif/co/bta_av_co.c
• modified: btif/src/btif_av.c
• modified: btif/src/btif_media_task.c
• modified: btif/src/btif_sock_l2cap.c
• modified: btif/src/stack_manager.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/btm/btm_dev.c
• modified: stack/btm/btm_devctl.c
• modified: stack/btu/btu_hcif.c
• modified: stack/hcic/hcicmds.c
• modified: stack/include/btm_api.h
• modified: stack/include/btm_ble_api.h
• modified: stack/include/hcimsgs.h
• modified: stack/l2cap/l2c_ble.c

差異

--- a/audio_a2dp_hw/bthost_ipc.c
+++ b/audio_a2dp_hw/bthost_ipc.c
@@ -421,8 +421,10 @@ static void* a2dp_codec_parser(uint8_t *codec_cfg, audio_format_t *codec_type)
             default:
                  ERROR("Unknown channel mode");
         }
-        if (*codec_type == AUDIO_FORMAT_APTX_HD)
+        if (*codec_type == AUDIO_FORMAT_APTX_HD) {
+            p_cfg += 4;
             len -= 4;//ignore 4 bytes not used
+        }
         if (len == 0)
             INFO("Codec config copied");
 

--- a/bta/av/bta_av_main.c
+++ b/bta/av/bta_av_main.c
@@ -80,7 +80,7 @@ enum
 {
     APTX = 1,
     AAC,
-    APTX_HD
+    APTXHD
 };
 
 /* state machine states */
@@ -709,19 +709,36 @@ static void bta_av_api_register(tBTA_AV_DATA *p_data)
                        {
                            if((*bta_av_a2d_cos.cap)(APTX) != TRUE)
                            {
+                               APPL_TRACE_DEBUG("%s: aptx-Classic offload codec not supported",__func__);
                                index++;
                                continue;
                            }
                            else
-                               APPL_TRACE_DEBUG("%s:codec supported",__func__)
+                               APPL_TRACE_DEBUG("%s:aptx-Classic offload codec supported",__func__)
+                       } else {
+                           if (codecId == A2D_APTX_HD_CODEC_ID_BLUETOOTH &&
+                                  vendorId == A2D_APTX_HD_VENDOR_ID ) {
+                               if((*bta_av_a2d_cos.cap)(APTXHD) != TRUE)
+                               {
+                                   APPL_TRACE_DEBUG("%s: aptx-HD offload codec not supported",__func__)
+                                   index++;
+                                   continue;
+                               }
+                               else
+                                   APPL_TRACE_DEBUG("%s: aptx-HD offload codec supported",__func__)
+
+                           }
                        }
                     }
                     else if (codec_type == AAC)
                     {
                         if ((*bta_av_a2d_cos.cap)(AAC) != TRUE)
                         {
+                            APPL_TRACE_DEBUG("%s: AAC offload codec not supported",__func__);
                             index++;
                             continue;
+                        } else {
+                            APPL_TRACE_DEBUG("%s: AAC offload codec supported",__func__);
                         }
                     }
                 } else if (codec_type == A2D_NON_A2DP_MEDIA_CT) {

--- 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/btif/co/bta_av_co.c
+++ b/btif/co/bta_av_co.c
@@ -122,9 +122,10 @@ const tA2D_SBC_CIE bta_av_co_sbc_sink_caps =
 #endif
 
 /* A2dp offload capabilities */
-#define SBC  0
-#define APTX 1
-#define AAC  2
+#define SBC    0
+#define APTX   1
+#define AAC    2
+#define APTXHD 3
 /* Default SBC codec configuration */
 const tA2D_SBC_CIE btif_av_sbc_default_config =
 {
@@ -170,7 +171,11 @@ const tA2D_APTX_HD_CIE bta_av_co_aptx_hd_caps =
 {
     A2D_APTX_HD_VENDOR_ID,
     A2D_APTX_HD_CODEC_ID_BLUETOOTH,
+#ifndef BTA_AV_SPLIT_A2DP_DEF_FREQ_48KHZ
     A2D_APTX_HD_SAMPLERATE_44100,
+#else
+    A2D_APTX_HD_SAMPLERATE_48000,
+#endif
     A2D_APTX_HD_CHANNELS_STEREO,
     A2D_APTX_HD_ACL_SPRINT_RESERVED0,
     A2D_APTX_HD_ACL_SPRINT_RESERVED1,
@@ -183,7 +188,11 @@ const tA2D_APTX_HD_CIE btif_av_aptx_hd_default_config =
 {
     A2D_APTX_HD_VENDOR_ID,
     A2D_APTX_HD_CODEC_ID_BLUETOOTH,
+#ifndef BTA_AV_SPLIT_A2DP_DEF_FREQ_48KHZ
     A2D_APTX_HD_SAMPLERATE_44100,
+#else
+    A2D_APTX_HD_SAMPLERATE_48000,
+#endif
     A2D_APTX_HD_CHANNELS_STEREO,
     A2D_APTX_HD_ACL_SPRINT_RESERVED0,
     A2D_APTX_HD_ACL_SPRINT_RESERVED1,
@@ -1698,13 +1707,13 @@ static BOOLEAN bta_av_co_audio_peer_supports_codec(tBTA_AV_CO_PEER *p_peer, UINT
  * multicast is not supported for aptX
  */
     if ((!bt_split_a2dp_enabled && isA2dAptXEnabled && (btif_av_is_multicast_supported() == FALSE)) ||
-        (bt_split_a2dp_enabled && btif_av_is_codec_offload_supported(APTX)))
+        (bt_split_a2dp_enabled && (btif_av_is_codec_offload_supported(APTX)|| btif_av_is_codec_offload_supported(APTXHD))))
     {
         UINT16 codecId;
         UINT32 vendorId;
         UINT8* aptx_capabilities;
 
-        if (isA2dAptXHdEnabled) {
+        if ((bt_split_a2dp_enabled && btif_av_is_codec_offload_supported(APTXHD)) || isA2dAptXHdEnabled) {
             for (index = 0; index < p_peer->num_sup_snks; index++)
             {
                 if (p_peer->snks[index].codec_type == A2D_NON_A2DP_MEDIA_CT)

--- a/btif/src/btif_av.c
+++ b/btif/src/btif_av.c
@@ -117,12 +117,14 @@ typedef struct
     BOOLEAN sbc_offload;
     BOOLEAN aptx_offload;
     BOOLEAN aac_offload;
+    BOOLEAN aptxhd_offload;
 } btif_av_a2dp_offloaded_codec_cap_t;
 
 typedef enum {
     SBC,
     APTX,
     AAC,
+    APTXHD,
 }btif_av_codec_list;
 
 /*****************************************************************************
@@ -299,6 +301,7 @@ const char *dump_av_codec_name(btif_av_codec_list codec)
         CASE_RETURN_STR(SBC)
         CASE_RETURN_STR(APTX)
         CASE_RETURN_STR(AAC)
+        CASE_RETURN_STR(APTXHD)
         default: return "UNKNOWN_CODEC";
     }
 }
@@ -2247,6 +2250,11 @@ static void a2dp_offload_codec_cap_parser(const char *value)
             BTIF_TRACE_ERROR("%s: AAC offload supported",__func__);
             btif_av_codec_offload.aac_offload = TRUE;
         }
+        else if (strcmp(tok,"aptxhd") == 0)
+        {
+            BTIF_TRACE_ERROR("%s: APTXHD offload supported",__func__);
+            btif_av_codec_offload.aptxhd_offload = TRUE;
+        }
         tok = strtok_r(NULL, "-", &tmp_token);
     };
 }
@@ -3645,10 +3653,13 @@ BOOLEAN btif_av_is_codec_offload_supported(int codec)
         case AAC:
             ret = btif_av_codec_offload.aac_offload;
             break;
+        case APTXHD:
+            ret = btif_av_codec_offload.aptxhd_offload;
+            break;
         default:
             ret = FALSE;
     }
-    BTIF_TRACE_DEBUG("btif_av_is_codec_offload_supported %s code supported = %d",dump_av_codec_name(codec),ret);
+    BTIF_TRACE_DEBUG("btif_av_is_codec_offload_supported %s codec supported = %d",dump_av_codec_name(codec),ret);
     return ret;
 }
 

--- a/btif/src/btif_media_task.c
+++ b/btif/src/btif_media_task.c
@@ -4312,6 +4312,8 @@ static void btif_media_send_aa_frame(uint64_t timestamp_us)
 #define A2DP_CODEC_AAC      2
 /* Below type is not defined in spec, it is for our convenience */
 #define A2DP_CODEC_APTX     8
+
+#define A2DP_CODEC_APTX_HD  9
 /* Need to check if we need a different type for APTX low latency
  * or just we can handle with reducing the MTU updated in media
  * channel configuration.
@@ -4324,6 +4326,7 @@ static void btif_media_send_aa_frame(uint64_t timestamp_us)
 #define A2DP_TRANSPORT_STREAM_TYPE_SBC      0
 #define A2DP_TRANSPORT_STREAM_TYPE_AAC      2
 #define A2DP_TRANSPORT_STREAM_TYPE_APTX     8
+#define A2DP_TRANSPORT_STREAM_TYPE_APTX_HD  9
 
 void disconnect_a2dp_on_vendor_start_failure()
 {
@@ -4506,8 +4509,16 @@ BOOLEAN btif_media_send_vendor_selected_codec()
     UINT16 index = 0;
 
     codec_type = bta_av_co_get_current_codec();
-    if (codec_type == A2D_NON_A2DP_MEDIA_CT)
-        codec_type = A2DP_CODEC_APTX;
+    if (codec_type == A2D_NON_A2DP_MEDIA_CT) {
+        UINT8* ptr = bta_av_co_get_current_codecInfo();
+        if (ptr) {
+            tA2D_APTX_CIE* codecInfo = (tA2D_APTX_CIE*) &ptr[BTA_AV_CFG_START_IDX];
+            if (codecInfo && codecInfo->vendorId == A2D_APTX_VENDOR_ID && codecInfo->codecId == A2D_APTX_CODEC_ID_BLUETOOTH)
+                   codec_type = A2DP_CODEC_APTX;
+            else if (codecInfo && codecInfo->vendorId == A2D_APTX_HD_VENDOR_ID && codecInfo->codecId == A2D_APTX_HD_CODEC_ID_BLUETOOTH)
+                   codec_type = A2DP_CODEC_APTX_HD;
+        }
+    }
 
     APPL_TRACE_IMP("btif_media_send_selected_codec: codec: %d", codec_type);
     param[index++] = VS_QHCI_A2DP_SELECTED_CODEC;
@@ -4566,8 +4577,18 @@ BOOLEAN btif_media_send_vendor_transport_cfg()
     UINT8 stream_type;
     APPL_TRACE_IMP("btif_media_send_vendor_transport_cfg: codec: %d", codec_type);
     stream_type = codec_type;
-    if (codec_type == A2D_NON_A2DP_MEDIA_CT)
-        stream_type = A2DP_TRANSPORT_STREAM_TYPE_APTX;
+
+    if (codec_type == A2D_NON_A2DP_MEDIA_CT) {
+        UINT8* ptr = bta_av_co_get_current_codecInfo();
+        if (ptr) {
+            tA2D_APTX_CIE* codecInfo = (tA2D_APTX_CIE*) &ptr[BTA_AV_CFG_START_IDX];
+            if (codecInfo && codecInfo->vendorId == A2D_APTX_VENDOR_ID && codecInfo->codecId == A2D_APTX_CODEC_ID_BLUETOOTH)
+                  stream_type = A2DP_TRANSPORT_STREAM_TYPE_APTX;
+            else if (codecInfo && codecInfo->vendorId == A2D_APTX_HD_VENDOR_ID && codecInfo->codecId == A2D_APTX_HD_CODEC_ID_BLUETOOTH)
+                  stream_type = A2DP_TRANSPORT_STREAM_TYPE_APTX_HD;
+        }
+    }
+
     param[0] = VS_QHCI_A2DP_TRANSPORT_CONFIGURATION;
     param[1] = A2DP_TRANSPORT_TYPE_SLIMBUS;
     param[2] = stream_type;

--- a/btif/src/btif_sock_l2cap.c
+++ b/btif/src/btif_sock_l2cap.c
@@ -90,7 +90,7 @@ typedef struct l2cap_socket {
 
 static bt_status_t btSock_start_l2cap_server_l(l2cap_socket *sock);
 
-static pthread_mutex_t state_lock;
+static pthread_mutex_t state_lock = PTHREAD_MUTEX_INITIALIZER;
 
 l2cap_socket *socks = NULL;
 static uid_set_t* uid_set = NULL;
@@ -367,7 +367,6 @@ fail_sockpair:
 bt_status_t btsock_l2cap_init(int handle, uid_set_t* set)
 {
     APPL_TRACE_DEBUG("%s handle = %d", __func__);
-    pthread_mutex_init(&state_lock, NULL);
     pthread_mutex_lock(&state_lock);
     pth = handle;
     socks = NULL;
@@ -384,7 +383,6 @@ bt_status_t btsock_l2cap_cleanup()
     while (socks)
         btsock_l2cap_free_l(socks);
     pthread_mutex_unlock(&state_lock);
-    pthread_mutex_destroy(&state_lock);
 
     return BT_STATUS_SUCCESS;
 }

--- a/btif/src/stack_manager.c
+++ b/btif/src/stack_manager.c
@@ -178,7 +178,9 @@ static void event_shut_down_stack(UNUSED_ATTR void *context) {
   module_shut_down(get_module(CONTROLLER_MODULE)); // Doesn't do any work, just puts it in a restartable state
 
   LOG_INFO(LOG_TAG, "%s finished", __func__);
+  hack_future = future_new();
   btif_thread_post(event_signal_stack_down, NULL);
+  future_await(hack_future);
 }
 
 static void ensure_stack_is_not_running(void) {
@@ -224,6 +226,7 @@ static void event_signal_stack_up(UNUSED_ATTR void *context) {
 
 static void event_signal_stack_down(UNUSED_ATTR void *context) {
   HAL_CBACK(bt_hal_cbacks, adapter_state_changed_cb, BT_STATE_OFF);
+  future_ready(stack_manager_get_hack_future(), FUTURE_SUCCESS);
 }
 
 static void ensure_manager_initialized(void) {

--- 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/btm/btm_dev.c
+++ b/stack/btm/btm_dev.c
@@ -297,6 +297,7 @@ void btm_sec_free_dev (tBTM_SEC_DEV_REC *p_dev_rec)
 {
     p_dev_rec->bond_type = BOND_TYPE_UNKNOWN;
     p_dev_rec->sec_flags = 0;
+    p_dev_rec->sm4 = BTM_SM4_UNKNOWN;
 
 #if BLE_INCLUDED == TRUE
     /* Clear out any saved BLE keys */

--- a/stack/btm/btm_devctl.c
+++ b/stack/btm/btm_devctl.c
@@ -226,6 +226,17 @@ void BTM_DeviceReset (UNUSED_ATTR tBTM_CMPL_CB *p_cb) {
   );
 }
 
+void BTM_HCI_Reset(void)
+{
+  /* Flush all ACL connections */
+  btm_acl_device_down();
+
+  /* Clear the callback, so application would not hang on reset */
+  btm_db_reset();
+
+  btsnd_hcic_reset(LOCAL_BR_EDR_CONTROLLER_ID);
+}
+
 /*******************************************************************************
 **
 ** Function         BTM_IsDeviceUp

--- a/stack/btu/btu_hcif.c
+++ b/stack/btu/btu_hcif.c
@@ -1153,7 +1153,7 @@ static void btu_hcif_hardware_error_evt (UINT8 *p)
 
     /* Reset the controller */
     if (BTM_IsDeviceUp())
-        BTM_DeviceReset (NULL);
+        BTM_HCI_Reset();
 
     if(*p == 0x0f || (*p == 0x0a))
     {

--- a/stack/hcic/hcicmds.c
+++ b/stack/hcic/hcicmds.c
@@ -726,6 +726,21 @@ BOOLEAN btsnd_hcic_write_def_policy_set (UINT16 settings)
     return (TRUE);
 }
 
+BOOLEAN btsnd_hcic_reset (UINT8 local_controller_id)
+{
+    BT_HDR *p = (BT_HDR *)osi_malloc(HCI_CMD_BUF_SIZE);
+    UINT8 *pp = (UINT8 *)(p + 1);
+
+    p->len    = HCIC_PREAMBLE_SIZE + HCIC_PARAM_SIZE_RESET;
+    p->offset = 0;
+
+    UINT16_TO_STREAM (pp, HCI_RESET);
+    UINT8_TO_STREAM (pp, HCIC_PARAM_SIZE_RESET);
+
+    btu_hcif_send_cmd (local_controller_id,  p);
+    return (TRUE);
+}
+
 BOOLEAN btsnd_hcic_set_event_filter (UINT8 filt_type, UINT8 filt_cond_type,
                                      UINT8 *filt_cond, UINT8 filt_cond_len)
 {

--- a/stack/include/btm_api.h
+++ b/stack/include/btm_api.h
@@ -1936,6 +1936,17 @@ extern void BTM_DeviceReset (tBTM_CMPL_CB *p_cb);
 
 /*******************************************************************************
 **
+** Function         BTM_HCI_Reset
+**
+** Description      This function is called to send reset command to the controller.
+**
+** Returns          void
+**
+*******************************************************************************/
+extern void BTM_HCI_Reset (void);
+
+/*******************************************************************************
+**
 ** Function         BTM_IsDeviceUp
 **
 ** Description      This function is called to check if the device is up.

--- 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/include/hcimsgs.h
+++ b/stack/include/hcimsgs.h
@@ -494,6 +494,10 @@ extern BOOLEAN btsnd_hcic_delete_stored_key (BD_ADDR bd_addr, BOOLEAN delete_all
 #define HCI_DELETE_KEY_ALL_FLAG_OFF     6
                                                                 /* Delete Stored Key */
 
+extern BOOLEAN btsnd_hcic_reset(UINT8 local_controller_id);    /* Reset */
+
+#define HCIC_PARAM_SIZE_RESET           0                       /* Reset */
+
                                                                 /* Change Local Name */
 extern BOOLEAN btsnd_hcic_change_name(BD_NAME name);
 

--- 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);
+    }
 }
 
 /*******************************************************************************