diff options
| author | Andre Eisenbach <eisenbach@google.com> | 2015-02-05 02:11:12 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 02:11:12 +0000 |
| commit | ce5ae4abddaab8865bb44c83d2d44e14b0d7536b (patch) | |
| tree | 1ac6b887346cb26a471dac7879759087d8819f31 | |
| parent | cf7f6a154aed48659260d391994dc59151be937b (diff) | |
| parent | a708936da347b32f2a0811b5f33d9068c2b0de6f (diff) | |
| download | bluedroid-ce5ae4abddaab8865bb44c83d2d44e14b0d7536b.tar.gz | |
am a708936d: DO NOT MERGE Change pairing_cb to assume temporary pairing by default
* commit 'a708936da347b32f2a0811b5f33d9068c2b0de6f':
DO NOT MERGE Change pairing_cb to assume temporary pairing by default
| -rw-r--r-- | btif/src/btif_dm.c | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index a10b372..1194c42 100644 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -109,11 +109,15 @@ BOOLEAN blacklistPairingRetries(BD_ADDR bd_addr) #define MAX_SDP_BL_ENTRIES 3 +#define BOND_TYPE_UNKNOWN 0 +#define BOND_TYPE_PERSISTENT 1 +#define BOND_TYPE_TEMPORARY 2 + typedef struct { bt_bond_state_t state; BD_ADDR bd_addr; - UINT8 is_temp; + UINT8 bond_type; UINT8 pin_code_len; UINT8 is_ssp; UINT8 auth_req; @@ -469,7 +473,7 @@ static void bond_state_changed(bt_status_t status, bt_bdaddr_t *bd_addr, bt_bond if ( (pairing_cb.state == state) && (state == BT_BOND_STATE_BONDING) ) return; - if (pairing_cb.is_temp) + if (pairing_cb.bond_type == BOND_TYPE_TEMPORARY) { state = BT_BOND_STATE_NONE; } @@ -898,9 +902,9 @@ static void btif_dm_ssp_cfm_req_evt(tBTA_DM_SP_CFM_REQ *p_ssp_cfm_req) if (p_ssp_cfm_req->just_works && !(p_ssp_cfm_req->loc_auth_req & BTM_AUTH_BONDS) && !(p_ssp_cfm_req->rmt_auth_req & BTM_AUTH_BONDS) && !(check_cod((bt_bdaddr_t*)&p_ssp_cfm_req->bd_addr, COD_HID_POINTING))) - pairing_cb.is_temp = TRUE; + pairing_cb.bond_type = BOND_TYPE_TEMPORARY; else - pairing_cb.is_temp = FALSE; + pairing_cb.bond_type = BOND_TYPE_PERSISTENT; pairing_cb.is_ssp = TRUE; @@ -988,11 +992,11 @@ static void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl) if ( (p_auth_cmpl->success == TRUE) && (p_auth_cmpl->key_present) ) { if ((p_auth_cmpl->key_type < HCI_LKEY_TYPE_DEBUG_COMB) || (p_auth_cmpl->key_type == HCI_LKEY_TYPE_AUTH_COMB) || - (p_auth_cmpl->key_type == HCI_LKEY_TYPE_CHANGED_COMB) || (!pairing_cb.is_temp)) + (p_auth_cmpl->key_type == HCI_LKEY_TYPE_CHANGED_COMB) || pairing_cb.bond_type == BOND_TYPE_PERSISTENT) { bt_status_t ret; - BTIF_TRACE_DEBUG("%s: Storing link key. key_type=0x%x, is_temp=%d", - __FUNCTION__, p_auth_cmpl->key_type, pairing_cb.is_temp); + BTIF_TRACE_DEBUG("%s: Storing link key. key_type=0x%x, bond_type=%d", + __FUNCTION__, p_auth_cmpl->key_type, pairing_cb.bond_type); ret = btif_storage_add_bonded_device(&bd_addr, p_auth_cmpl->key, p_auth_cmpl->key_type, pairing_cb.pin_code_len); @@ -1000,9 +1004,9 @@ static void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl) } else { - BTIF_TRACE_DEBUG("%s: Temporary key. Not storing. key_type=0x%x, is_temp=%d", - __FUNCTION__, p_auth_cmpl->key_type, pairing_cb.is_temp); - if(pairing_cb.is_temp) + BTIF_TRACE_DEBUG("%s: Temporary key. Not storing. key_type=0x%x, bond_type=%d", + __FUNCTION__, p_auth_cmpl->key_type, pairing_cb.bond_type); + if(pairing_cb.bond_type == BOND_TYPE_TEMPORARY) { BTIF_TRACE_DEBUG("%s: sending BT_BOND_STATE_NONE for Temp pairing", __FUNCTION__); @@ -2964,7 +2968,7 @@ void btif_dm_ble_sec_req_evt(tBTA_DM_BLE_SEC_REQ *p_ble_req) bond_state_changed(BT_STATUS_SUCCESS, &bd_addr, BT_BOND_STATE_BONDING); - pairing_cb.is_temp = FALSE; + pairing_cb.bond_type = BOND_TYPE_PERSISTENT; pairing_cb.is_le_only = TRUE; pairing_cb.is_ssp = TRUE; |