diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-11 04:05:26 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-11 17:01:09 -0800 |
| commit | 718ba0bd6de6a0f4b8c63f0146f8978981eb5cb4 (patch) | |
| tree | abf1ab9ce750848bcdb65ecf200676f9e1fec00e /stack/btm | |
| parent | 775a7bab3bde0cf64b638100a5b40b22d421bb88 (diff) | |
| parent | 04e4c5498beb89f54251dbbda6c83622372bd979 (diff) | |
| download | android_system_bt-718ba0bd6de6a0f4b8c63f0146f8978981eb5cb4.tar.gz android_system_bt-718ba0bd6de6a0f4b8c63f0146f8978981eb5cb4.tar.bz2 android_system_bt-718ba0bd6de6a0f4b8c63f0146f8978981eb5cb4.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/system/bt into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Change-Id: I2e682780163afc7e9c88865192a6342027c80586
Diffstat (limited to 'stack/btm')
| -rw-r--r-- | stack/btm/btm_acl.c | 1 | ||||
| -rw-r--r-- | stack/btm/btm_dev.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/stack/btm/btm_acl.c b/stack/btm/btm_acl.c index 93928d4d2..7e3af0616 100644 --- a/stack/btm/btm_acl.c +++ b/stack/btm/btm_acl.c @@ -332,6 +332,7 @@ void btm_acl_created (BD_ADDR bda, DEV_CLASS dc, BD_NAME bdn, /* if BR/EDR do something more */ if (transport == BT_TRANSPORT_BR_EDR) { + btsnd_hcic_read_rmt_clk_offset (p->hci_handle); btsnd_hcic_rmt_ver_req (p->hci_handle); } p_dev_rec = btm_find_dev_by_handle (hci_handle); diff --git a/stack/btm/btm_dev.c b/stack/btm/btm_dev.c index 44a3bf8a9..78af31ffb 100644 --- a/stack/btm/btm_dev.c +++ b/stack/btm/btm_dev.c @@ -152,9 +152,9 @@ BOOLEAN BTM_SecAddDevice (BD_ADDR bd_addr, DEV_CLASS dev_class, BD_NAME bd_name, if (pin_length >= 16 || key_type == BTM_LKEY_TYPE_AUTH_COMB || key_type == BTM_LKEY_TYPE_AUTH_COMB_P_256) { - // Set the fiag if the link key was made by using either a 16 digit + // Set the flag if the link key was made by using either a 16 digit // pin or MITM. - p_dev_rec->sec_flags |= BTM_SEC_16_DIGIT_PIN_AUTHED; + p_dev_rec->sec_flags |= BTM_SEC_16_DIGIT_PIN_AUTHED | BTM_SEC_LINK_KEY_AUTHED; } } |