diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-23 05:04:59 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-23 05:04:59 -0700 |
| commit | 414edc200c1c6adb5fc2227befe48d7f8c64d238 (patch) | |
| tree | e34117efdb8dddb54185c693ba62d0cab03cbc32 /stack/btm | |
| parent | 08882138a1bbe0239ad438cd77d72105e47af506 (diff) | |
| parent | 585a284f99ac0cb90bbc4fdd13914598b38573fd (diff) | |
| download | android_system_bt-414edc200c1c6adb5fc2227befe48d7f8c64d238.tar.gz android_system_bt-414edc200c1c6adb5fc2227befe48d7f8c64d238.tar.bz2 android_system_bt-414edc200c1c6adb5fc2227befe48d7f8c64d238.zip | |
Merge "Bluetooth: Handled smp over BR/EDR for temp pairing"
Diffstat (limited to 'stack/btm')
| -rw-r--r-- | stack/btm/btm_sec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c index ad40d3d2c..5d8cbcd9e 100644 --- a/stack/btm/btm_sec.c +++ b/stack/btm/btm_sec.c @@ -4647,7 +4647,7 @@ void btm_sec_encrypt_change (UINT16 handle, UINT8 status, UINT8 encr_enable) derive_LTK = FALSE; BTM_TRACE_DEBUG("%s skip derivation of LTK", __func__); } - if (p_dev_rec->new_encryption_key_is_p256 && derive_LTK) + if (p_dev_rec->new_encryption_key_is_p256) { if (btm_sec_use_smp_br_chnl(p_dev_rec) && btm_sec_is_master(p_dev_rec) && @@ -4655,7 +4655,7 @@ void btm_sec_encrypt_change (UINT16 handle, UINT8 status, UINT8 encr_enable) (!(p_dev_rec->sec_flags &BTM_SEC_LE_LINK_KEY_KNOWN) || /* or BR key is higher security than existing LE keys */ (!(p_dev_rec->sec_flags & BTM_SEC_LE_LINK_KEY_AUTHED) - && (p_dev_rec->sec_flags & BTM_SEC_LINK_KEY_AUTHED)))) + && (p_dev_rec->sec_flags & BTM_SEC_LINK_KEY_AUTHED))) && derive_LTK) { /* BR/EDR is encrypted with LK that can be used to derive LE LTK */ p_dev_rec->new_encryption_key_is_p256 = FALSE; |