commit 969ee97d60ba3e97cdd56e453b357f1e2752af65
author venkata Jagadeesh <vjagad@codeaurora.org> Thu Oct 01 11:55:03 2015 +0530
committer Andre Eisenbach <eisenbach@google.com> Tue May 17 17:56:48 2016 +0000
tree f9f2c0317bc14a1778ecb46eacc24198c9133b22
parent 234af83f69d70dc89a2c7ae6557b8c63f737437b

Fix pairing state change in collision scenario

Symptom:
DUT Stuck in pairing state forever with selfy stick
during repair.

Steps:
1. Pair and connect remote devices with DUT.
2. Now un pair selfy stick from DUT.
3. Keep remote in discoverable mode.
4. Start inquiry and try to pair with device.

Failure:
Pairing with selfy stick always fails after collision.

Root Cause:
As we return from btm_sec_dd_create_conn with out
moving pairing state in connection collision scenario. Pairing
state will remains idle and pairing won't proceed further.

Fix:
Move the pairing state in collision scenario so that pairing
can proceed further.

Change-Id: Ic5c446ad3902b0ce16c7223ec2d8e4a625831446

stack/btm/btm_sec.c

diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c
index 633e553..f967e98 100644
--- a/stack/btm/btm_sec.c
+++ b/stack/btm/btm_sec.c
@@ -3008,6 +3008,7 @@
     if (p_lcb && (p_lcb->link_state == LST_CONNECTED || p_lcb->link_state == LST_CONNECTING))
     {
        BTM_TRACE_WARNING("%s Connection already exists", __func__);
+       btm_sec_change_pairing_state(BTM_PAIR_STATE_WAIT_PIN_REQ);
        return BTM_CMD_STARTED;
     }