diff options
| author | Ravi Nagarajan <nravi@broadcom.com> | 2012-04-09 19:18:39 +0530 |
|---|---|---|
| committer | Matthew Xie <mattx@google.com> | 2012-07-14 11:19:15 -0700 |
| commit | ee20641263a5f34fe6c8dab176d95e07243657b1 (patch) | |
| tree | b6cef13737b17d6692cae4701c54d601b691b26a /btif | |
| parent | 0ef57283c2ed9582f9521082f6a8cc4e9c91e82b (diff) | |
| download | external_bluetooth_bluedroid-ee20641263a5f34fe6c8dab176d95e07243657b1.zip external_bluetooth_bluedroid-ee20641263a5f34fe6c8dab176d95e07243657b1.tar.gz external_bluetooth_bluedroid-ee20641263a5f34fe6c8dab176d95e07243657b1.tar.bz2 | |
Auto-accept JustWorks pairing - both incoming & outgoing. Prompting user for JustWorks pairing causes PTS & CTS failures
Change-Id: I7154b8c3c5864a7bfffdb884386daa6b5f347da5
Diffstat (limited to 'btif')
| -rwxr-xr-x | btif/src/btif_dm.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index 2bf6611..351f189 100755 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -450,10 +450,6 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ *p_ssp_cfm_req) bt_bdaddr_t bd_addr; bt_bdname_t bd_name; UINT32 cod; - BOOLEAN incoming_bonding; - - /* if bonding state is BT_BOND_STATE_BONDING, then we initiated it */ - incoming_bonding = !(pairing_cb.state == BT_BOND_STATE_BONDING); BTIF_TRACE_DEBUG1("%s", __FUNCTION__); bdcpy(bd_addr.address, p_ssp_cfm_req->bd_addr); @@ -469,8 +465,8 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ *p_ssp_cfm_req) else pairing_cb.is_temp = TRUE; - /* If JustWorks auto-accept if we initiated bonding */ - if (p_ssp_cfm_req->just_works && !incoming_bonding) + /* If JustWorks auto-accept */ + if (p_ssp_cfm_req->just_works) { BTIF_TRACE_EVENT1("%s: Auto-accept JustWorks pairing", __FUNCTION__); btif_dm_ssp_reply(&bd_addr, BT_SSP_VARIANT_CONSENT, TRUE, 0); @@ -484,9 +480,8 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ *p_ssp_cfm_req) cod = COD_UNCLASSIFIED; } - /* TODO: pairing variant passkey_entry? */ HAL_CBACK(bt_hal_cbacks, ssp_request_cb, &bd_addr, &bd_name, - cod, p_ssp_cfm_req->just_works ? BT_SSP_VARIANT_CONSENT : BT_SSP_VARIANT_PASSKEY_CONFIRMATION, + cod, BT_SSP_VARIANT_PASSKEY_CONFIRMATION, p_ssp_cfm_req->num_val); } |