commit 2e470dc48e608fd46cd2d55aa01efb9ce7eb4bdb
author Matthew Xie <mattx@google.com> Tue Apr 22 00:00:02 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 22 00:00:02 2014 +0000
tree c9fc5234f00731e9b754473dc197a8d0bddaef06
parent 4b41613019829b40e8ca75a87219a415c51ae3a1
parent 57bda5037c0798c85388428a6d3a7771e1cc8034

Merge "Use 0000 as pin key for PORCHE_PAIRING_CONFLICT issue"

stack/btm/btm_sec.c

diff --git a/stack/btm/btm_sec.c b/stack/btm/btm_sec.c
index 8bcf435..1e15d78 100644
--- a/stack/btm/btm_sec.c
+++ b/stack/btm/btm_sec.c
@@ -4774,6 +4774,10 @@
     tBTM_SEC_DEV_REC *p_dev_rec;
     tBTM_CB          *p_cb = &btm_cb;
 
+#ifdef PORCHE_PAIRING_CONFLICT
+    UINT8 default_pin_code_len = 4;
+    PIN_CODE default_pin_code = {0x30, 0x30, 0x30, 0x30};
+#endif
     BTM_TRACE_EVENT3 ("btm_sec_pin_code_request()  State: %s, BDA:%04x%08x",
                       btm_pair_state_descr(btm_cb.pairing_state),
                       (p_bda[0]<<8)+p_bda[1], (p_bda[2]<<24)+(p_bda[3]<<16)+(p_bda[4]<<8)+p_bda[5] );
@@ -4807,7 +4811,8 @@
             BTM_TRACE_EVENT0 ("btm_sec_pin_code_request from remote dev. for local initiated pairing");
             if(! btm_cb.pin_code_len_saved)
             {
-                btsnd_hcic_pin_code_neg_reply (p_bda);
+                btm_sec_change_pairing_state (BTM_PAIR_STATE_WAIT_AUTH_COMPLETE);
+                btsnd_hcic_pin_code_req_reply (p_bda, default_pin_code_len, default_pin_code);
             }
             else
             {