diff options
| author | Zach Johnson <zachoverflow@google.com> | 2015-12-02 18:24:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-02 18:24:58 +0000 |
| commit | a7945b11ce231d53f5ced337136cd34ee8e5eea3 (patch) | |
| tree | a0474ae585a652b0dbc6669c94937515ee53a57b | |
| parent | 9c55e7e6e0816caf83c263fd0ef7e4c4410fb46f (diff) | |
| parent | e6242fcf303f195d31eaaca97146e341b2b49e70 (diff) | |
| download | android_system_bt-a7945b11ce231d53f5ced337136cd34ee8e5eea3.tar.gz android_system_bt-a7945b11ce231d53f5ced337136cd34ee8e5eea3.tar.bz2 android_system_bt-a7945b11ce231d53f5ced337136cd34ee8e5eea3.zip | |
Merge "Mark secure link as authenticated for LE" into cw-e-dev
am: e6242fcf30
* commit 'e6242fcf303f195d31eaaca97146e341b2b49e70':
Mark secure link as authenticated for LE
| -rw-r--r-- | stack/btm/btm_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/stack/btm/btm_dev.c b/stack/btm/btm_dev.c index 0189bdab9..46a15d062 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; } } |