component/bt:Recovery the btm_establish_continue when created the acl connection

diff --git a/components/bt/bluedroid/include/bt_target.h b/components/bt/bluedroid/include/bt_target.h
index 7c3517bf1fcc4a22d20c4dcf4901675a12af542f..e1a898aabc7718e990fdc764e631ec952b5d7dbb 100644 (file)
--- a/components/bt/bluedroid/include/bt_target.h
+++ b/components/bt/bluedroid/include/bt_target.h
@@ -111,6 +111,9 @@
 #define BLE_PRIVACY_SPT           FALSE
 #endif  /* CONFIG_GATTC_ENABLE */
 
+#if (CONFIG_BT_ACL_CONNECTIONS)
+#define MAX_ACL_CONNECTIONS CONFIG_BT_ACL_CONNECTIONS
+#endif  /* CONFIG_BT_ACL_CONNECTIONS */
 
 //------------------Added from bdroid_buildcfg.h---------------------
 #ifndef L2CAP_EXTFEA_SUPPORTED_MASK
@@ -709,10 +712,6 @@
 #define L2CAP_CLIENT_INCLUDED FALSE
 #endif
 
-/* The default connection link number set to 1, 
-** if the user want to support muti connction, should change it in the menuconfig */
-#define MAX_ACL_CONNECTIONS         1   
-
 /* The maximum number of simultaneous links that L2CAP can support. Up to 7*/
 #ifndef MAX_ACL_CONNECTIONS
 #define MAX_L2CAP_LINKS             3
@@ -984,7 +983,7 @@
 #endif
 
 #ifndef GATT_MAX_PHY_CHANNEL
-#define GATT_MAX_PHY_CHANNEL        7
+#define GATT_MAX_PHY_CHANNEL        1
 #endif
 
 /* Used for conformance testing ONLY */

diff --git a/components/bt/bluedroid/stack/btm/btm_acl.c b/components/bt/bluedroid/stack/btm/btm_acl.c
index 640268265c9123bd21eb7ae212e31c0186fb96c6..0b46a67761549007f6c03a05e6654789335ae96f 100644 (file)
--- a/components/bt/bluedroid/stack/btm/btm_acl.c
+++ b/components/bt/bluedroid/stack/btm/btm_acl.c
@@ -289,7 +289,7 @@ void btm_acl_created (BD_ADDR bda, DEV_CLASS dc, BD_NAME bdn,
                         l2cu_resubmit_pending_sec_req (p_dev_rec->bd_addr);
                     }
 #endif  ///CLASSIC_BT_INCLUDED == TRUE
-                    //btm_establish_continue (p);
+                    btm_establish_continue (p);
                     return;
                 }
             }
@@ -310,7 +310,7 @@ void btm_acl_created (BD_ADDR bda, DEV_CLASS dc, BD_NAME bdn,
                          && link_role == HCI_ROLE_SLAVE) {
                     //do nothing in this case for fix the android7.0 cann't sent security request issue
                 } else {
-                    //btm_establish_continue(p);
+                    btm_establish_continue(p);
                 }
             } else
 #endif