From: Andre Eisenbach <eisenbach@google.com>
Date: Thu, 16 Apr 2015 00:56:03 +0000 (-0700)
Subject: Fix LE pairing
X-Git-Tag: android-x86-7.1-r1~1245^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ca8e356;p=android-x86%2Fsystem-bt.git

Fix LE pairing

Change-Id: Ie4ecab207f83d8ec27c5922c0c794f8bd824255f
---

diff --git a/stack/l2cap/l2c_ble.c b/stack/l2cap/l2c_ble.c
index 05ff5bf40..75032b2b0 100644
--- a/stack/l2cap/l2c_ble.c
+++ b/stack/l2cap/l2c_ble.c
@@ -352,14 +352,6 @@ void l2cble_scanner_conn_comp (UINT16 handle, BD_ADDR bda, tBLE_ADDR_TYPE type,
     p_lcb->peer_chnl_mask[0] = L2CAP_FIXED_CHNL_ATT_BIT | L2CAP_FIXED_CHNL_BLE_SIG_BIT | L2CAP_FIXED_CHNL_SMP_BIT;
 
     btm_ble_set_conn_st(BLE_CONN_IDLE);
-    /*
-     * This is wrong. However, querying the other side is wrong too, since as per spec they
-     * cannot really tell us when they have fixed channels open. Yes, bluedroid breaks the
-     * spec in EDR mode in that respect, but that it a whole new story.
-     */
-    for(i = 0; i < L2CAP_FIXED_CHNL_ARRAY_SIZE; i++)
-        p_lcb->peer_chnl_mask[i] = 0xFF;
-    l2cu_process_fixed_chnl_resp (p_lcb);
 }
 
 
@@ -439,14 +431,6 @@ void l2cble_advertiser_conn_comp (UINT16 handle, BD_ADDR bda, tBLE_ADDR_TYPE typ
     {
         L2CA_CancelBleConnectReq(bda);
     }
-    /*
-     * This is wrong. However, querying the other side is wrong too, since as per spec they
-     * cannot really tell us when they have fixed channels open. Yes, bluedroid breaks the
-     * spec in EDR mode in that respect, but that it a whole new story.
-     */
-    for(i = 0; i < L2CAP_FIXED_CHNL_ARRAY_SIZE; i++)
-        p_lcb->peer_chnl_mask[i] = 0xFF;
-    l2cu_process_fixed_chnl_resp (p_lcb);
 }
 
 /*******************************************************************************