diff options
| author | Satya Calloji <satyac@broadcom.com> | 2015-04-30 13:58:59 -0700 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-05-20 23:09:59 -0700 |
| commit | c0a4342caa940e4d214d748c09583e7c8bff7c74 (patch) | |
| tree | 98335900e25b02dbea3d43618764697f64fba5e8 /stack/smp | |
| parent | d0aa8e53aa7ac1137a47570e08c2b963aaa49141 (diff) | |
| download | android_system_bt-c0a4342caa940e4d214d748c09583e7c8bff7c74.tar.gz android_system_bt-c0a4342caa940e4d214d748c09583e7c8bff7c74.tar.bz2 android_system_bt-c0a4342caa940e4d214d748c09583e7c8bff7c74.zip | |
Fixed cross key for LE when paired over BR-EDR
SMP state machine was resending security request and waiting for a response
when paired over BR-EDR. The state machine state timed out due to this and
SMP failed while doing cross key pairing. Thus, user was asked for pairing
again.
Original author: Priti Aghera <paghera@broadcom.com>
Change-Id: I568f936bb7bee21fb78e8454469ecad3445f026f
Diffstat (limited to 'stack/smp')
| -rw-r--r-- | stack/smp/smp_act.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/stack/smp/smp_act.c b/stack/smp/smp_act.c index f4e81dcb0..4adde966d 100644 --- a/stack/smp/smp_act.c +++ b/stack/smp/smp_act.c @@ -810,7 +810,8 @@ void smp_br_process_pairing_command(tSMP_CB *p_cb, tSMP_INT_DATA *p_data) if (p_cb->role == HCI_ROLE_SLAVE) { p_dev_rec->new_encryption_key_is_p256 = FALSE; - p_cb->cb_evt = SMP_SEC_REQUEST_EVT; + /* shortcut to skip Security Grant step */ + p_cb->cb_evt = SMP_BR_KEYS_REQ_EVT; } else /* Master receives pairing response */ { |