From e19fdc247498804edcb5d23639a2f6edbb6dfacc Mon Sep 17 00:00:00 2001 From: Nitin Arora Date: Tue, 12 Apr 2016 17:09:37 -0700 Subject: [PATCH] Revert "Fix bug where a bonded device could enter BONDING and BONDED states again." This reverts commit 0b7fc589089ce4a96daa668b9d293ce01982424d. Conflicts: btif/src/btif_dm.c CRs-Fixed: 1033628 Change-Id: I1b7ccf0ff4eaebe1c947ee81e50e4587a1bdbb47 --- btif/src/btif_dm.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c index b8c937493..c3e129f50 100644 --- a/btif/src/btif_dm.c +++ b/btif/src/btif_dm.c @@ -1180,20 +1180,6 @@ static void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl) } } - // We could have received a new link key without going through the pairing flow. - // If so, we don't want to perform SDP or any other operations on the authenticated - // device. - if (bdcmp(p_auth_cmpl->bd_addr, pairing_cb.bd_addr) != 0) { - char address[32]; - bt_bdaddr_t bt_bdaddr; - - memcpy(bt_bdaddr.address, p_auth_cmpl->bd_addr, - sizeof(bt_bdaddr.address)); - bdaddr_to_string(&bt_bdaddr, address, sizeof(address)); - LOG_INFO(LOG_TAG, "%s skipping SDP since we did not initiate pairing to %s.", __func__, address); - return; - } - // Skip SDP for certain HID Devices if (p_auth_cmpl->success) { -- 2.11.0