mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-06-26 14:42:13 +00:00
202033c013
This adds 3 expat patches for n-asb-2022-09 from https://github.com/syphyr/android_external_expat/commits/cm-14.1 and also applies 2 of them to 15.1 Signed-off-by: Tad <tad@spotco.us>
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Roopa Sattiraju <sattiraju@google.com>
|
|
Date: Wed, 25 May 2022 21:00:01 +0000
|
|
Subject: [PATCH] Removing bonded device when auth fails due to missing keys
|
|
|
|
Bug: 231161832
|
|
Test: Test against trying to connect using the same address
|
|
Change-Id: I2a23440303758faf281989abdb2a614708f05d36
|
|
Merged-In: I2a23440303758faf281989abdb2a614708f05d36
|
|
(cherry picked from commit 21df1076a4b9c1d1bbe3f5ecb475fe0b7c1b8c2a)
|
|
Merged-In: I2a23440303758faf281989abdb2a614708f05d36
|
|
---
|
|
btif/src/btif_dm.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/btif/src/btif_dm.c b/btif/src/btif_dm.c
|
|
index 3b6f2a744..8dfbae924 100644
|
|
--- a/btif/src/btif_dm.c
|
|
+++ b/btif/src/btif_dm.c
|
|
@@ -1387,7 +1387,6 @@ static void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl)
|
|
break;
|
|
|
|
case HCI_ERR_PAIRING_NOT_ALLOWED:
|
|
- btif_storage_remove_bonded_device(&bd_addr);
|
|
status = BT_STATUS_AUTH_REJECTED;
|
|
break;
|
|
|
|
@@ -1398,7 +1397,6 @@ static void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl)
|
|
/* map the auth failure codes, so we can retry pairing if necessary */
|
|
case HCI_ERR_AUTH_FAILURE:
|
|
case HCI_ERR_KEY_MISSING:
|
|
- btif_storage_remove_bonded_device(&bd_addr);
|
|
case HCI_ERR_HOST_REJECT_SECURITY:
|
|
case HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE:
|
|
case HCI_ERR_UNIT_KEY_USED:
|
|
@@ -1429,7 +1427,6 @@ static void btif_dm_auth_cmpl_evt (tBTA_DM_AUTH_CMPL *p_auth_cmpl)
|
|
if (check_cod(&bd_addr, COD_HID_POINTING)) {
|
|
/* Remove Device as bonded in nvram as authentication failed */
|
|
BTIF_TRACE_DEBUG("%s(): removing hid pointing device from nvram", __FUNCTION__);
|
|
- btif_storage_remove_bonded_device(&bd_addr);
|
|
}
|
|
bond_state_changed(status, &bd_addr, state);
|
|
}
|