commit 7ae25156f4250af9d0e8cd8d559d916cfb847feb
author Prerepa Viswanadham <dham@google.com> Wed Sep 10 17:08:11 2014 -0700
committer Prerepa Viswanadham <dham@google.com> Fri Sep 12 22:39:45 2014 +0000
tree bf14c2112965cba9429f6f734702754bc34639e7
parent 976990f872bb0873fedbb74649d0bf704bb70d05

Avoid premature LE connection notifaction to app

To avoid premature connection notification to app, always wait for
LE read remote feature complete with success before the connection
event is sent to application.

This patch also deprecates the BTA_SKIP_BLE_READ_REMOTE_FEAT flag.
Since the remote feature request is now serialized and start encryption
won't be called until the connection is up, this flag is no longer
necessary and interferes with the new behaviour.

This is an extension of previous CL

Bug: 17326529
Change-Id: Icfd4c5dfdd9f89d1318ef429e132eb005abb1f64

stack/btm/btm_acl.c

diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c
index febca85..0d65249 100644
--- a/stack/btm/btm_acl.c
+++ b/stack/btm/btm_acl.c
@@ -374,15 +374,15 @@
                     &p->active_remote_addr_type);
 #endif
 
-#if (!defined(BTA_SKIP_BLE_READ_REMOTE_FEAT) || BTA_SKIP_BLE_READ_REMOTE_FEAT == FALSE)
                 if (HCI_LE_SLAVE_INIT_FEAT_EXC_SUPPORTED(btm_cb.devcb.local_le_features)
                     || link_role == HCI_ROLE_MASTER)
                 {
                     btsnd_hcic_ble_read_remote_feat(p->hci_handle);
                 }
                 else
-#endif
-                btm_establish_continue(p);
+                {
+                    btm_establish_continue(p);
+                }
             }
             else
 #endif