diff options
| author | Sudharma Damgatla <sudharma@codeaurora.org> | 2015-12-10 16:30:24 +0530 |
|---|---|---|
| committer | Sridhar Gujje <sgujje@codeaurora.org> | 2015-12-10 21:23:36 +0530 |
| commit | 1265afd4c6574e0432cdadca6bde3b8a58740d46 (patch) | |
| tree | cd584d23961ef2bd0fbb363632b814378525f894 /stack/btm | |
| parent | cc034991d31c3ad1cf9b9d44655dc256c6b68228 (diff) | |
| parent | 3e8755eca7a61ac580a197697e0217e7c1681eb6 (diff) | |
| download | android_system_bt-1265afd4c6574e0432cdadca6bde3b8a58740d46.tar.gz android_system_bt-1265afd4c6574e0432cdadca6bde3b8a58740d46.tar.bz2 android_system_bt-1265afd4c6574e0432cdadca6bde3b8a58740d46.zip | |
git merge android-6.0.1_r3 on to remote branch
Change-Id: I501838b5f3f9d8bf60ab8df59a322a6f1e9199b9
Diffstat (limited to 'stack/btm')
| -rw-r--r-- | stack/btm/btm_acl.c | 17 | ||||
| -rw-r--r-- | stack/btm/btm_ble_gap.c | 3 |
2 files changed, 12 insertions, 8 deletions
diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c index e4dca3fb8..7f1ba27cb 100644 --- a/stack/btm/btm_acl.c +++ b/stack/btm/btm_acl.c @@ -1007,15 +1007,16 @@ void btm_read_remote_version_complete (UINT8 *p) UINT16 handle; int xx; BTM_TRACE_DEBUG ("btm_read_remote_version_complete"); + STREAM_TO_UINT8 (status, p); - if (status == HCI_SUCCESS) - { - STREAM_TO_UINT16 (handle, p); + STREAM_TO_UINT16 (handle, p); - /* Look up the connection by handle and copy features */ - for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p_acl_cb++) + /* Look up the connection by handle and copy features */ + for (xx = 0; xx < MAX_L2CAP_LINKS; xx++, p_acl_cb++) + { + if ((p_acl_cb->in_use) && (p_acl_cb->hci_handle == handle)) { - if ((p_acl_cb->in_use) && (p_acl_cb->hci_handle == handle)) + if (status == HCI_SUCCESS) { STREAM_TO_UINT8 (p_acl_cb->lmp_version, p); STREAM_TO_UINT16 (p_acl_cb->manufacturer, p); @@ -1028,6 +1029,10 @@ void btm_read_remote_version_complete (UINT8 *p) btm_read_remote_features (p_acl_cb->hci_handle); break; } + + if (p_acl_cb->transport == BT_TRANSPORT_LE) + l2cble_notify_le_connection (p_acl_cb->remote_addr); + break; } } } diff --git a/stack/btm/btm_ble_gap.c b/stack/btm/btm_ble_gap.c index 19ec9e75a..8c24e7da9 100644 --- a/stack/btm/btm_ble_gap.c +++ b/stack/btm/btm_ble_gap.c @@ -3215,8 +3215,7 @@ void btm_ble_read_remote_features_complete(UINT8 *p) if ((p_acl_cb->in_use) && (p_acl_cb->hci_handle == handle)) { STREAM_TO_ARRAY(p_acl_cb->peer_le_features, p, BD_FEATURES_LEN); - /*notify link up here */ - l2cble_notify_le_connection (p_acl_cb->remote_addr); + btsnd_hcic_rmt_ver_req (p_acl_cb->hci_handle); break; } } |