Commit: b055f8b68a530af49726329a719469f024594cda - system-bt (git)

system/bt

Commit MetaInfo

• Revision: b055f8b68a530af49726329a719469f024594cda (tree)
• Zeit: 2017-04-29 12:48:19
• Autor: Jacky Cheung <jackyc@goog...>
• Commiter: Android (Google) Code Review

Log Message

Merge "DO NOT MERGE ANYWHERE Fix LE disconnecting right after pairing" into cw-f-dev

Ändern Zusammenfassung

• modified: stack/l2cap/l2c_utils.c

Diff

--- a/stack/l2cap/l2c_utils.c
+++ b/stack/l2cap/l2c_utils.c
@@ -1745,6 +1745,12 @@ void l2cu_release_ccb (tL2C_CCB *p_ccb)
     {
         if (!p_lcb->ccb_queue.p_first_ccb)
         {
+            // Closing a security channel on LE device should not start connection
+            // timeout
+            if (p_lcb->transport == BT_TRANSPORT_LE &&
+                p_ccb->local_cid == L2CAP_SMP_CID)
+                return;
+
             l2cu_no_dynamic_ccbs (p_lcb);
         }
         else