mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-09-21 16:56:08 +00:00
082bc48c32
https://review.lineageos.org/q/topic:P_asb_2022-05 https://review.lineageos.org/q/topic:P_asb_2022-06 https://review.lineageos.org/q/topic:P_asb_2022-07 https://review.lineageos.org/q/topic:P_asb_2022-08 https://review.lineageos.org/q/topic:P_asb_2022-09 https://review.lineageos.org/q/topic:P_asb_2022-10 https://review.lineageos.org/q/topic:P_asb_2022-11 https://review.lineageos.org/q/topic:P_asb_2022-12 https://review.lineageos.org/q/topic:P_asb_2023-01 https://review.lineageos.org/q/topic:P_asb_2023-02 https://review.lineageos.org/q/topic:P_asb_2023-03 https://review.lineageos.org/q/topic:P_asb_2023-04 https://review.lineageos.org/q/topic:P_asb_2023-05 https://review.lineageos.org/q/topic:P_asb_2023-06 https://review.lineageos.org/q/topic:P_asb_2023-07 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/361250 https://review.lineageos.org/q/topic:P_asb_2023-08 accounted for via manifest change: https://review.lineageos.org/c/LineageOS/android_external_freetype/+/364606 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/365328 https://review.lineageos.org/q/topic:P_asb_2023-09 https://review.lineageos.org/q/topic:P_asb_2023-10 https://review.lineageos.org/q/topic:P_asb_2023-11 accounted for via patches: https://review.lineageos.org/c/LineageOS/android_system_ca-certificates/+/374916 https://review.lineageos.org/q/topic:P_asb_2023-12 https://review.lineageos.org/q/topic:P_asb_2024-01 https://review.lineageos.org/q/topic:P_asb_2024-02 https://review.lineageos.org/q/topic:P_asb_2024-03 https://review.lineageos.org/q/topic:P_asb_2024-04 Signed-off-by: Tavi <tavi@divested.dev>
43 lines
1.7 KiB
Diff
43 lines
1.7 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.cc | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/btif/src/btif_dm.cc b/btif/src/btif_dm.cc
|
|
index f2347cc64..56d1cec7d 100644
|
|
--- a/btif/src/btif_dm.cc
|
|
+++ b/btif/src/btif_dm.cc
|
|
@@ -1163,14 +1163,12 @@ 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;
|
|
|
|
/* 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:
|
|
@@ -1200,7 +1198,6 @@ static void btif_dm_auth_cmpl_evt(tBTA_DM_AUTH_CMPL* p_auth_cmpl) {
|
|
/* Remove Device as bonded in nvram as authentication failed */
|
|
BTIF_TRACE_DEBUG("%s(): removing hid pointing device from nvram",
|
|
__func__);
|
|
- btif_storage_remove_bonded_device(&bd_addr);
|
|
}
|
|
bond_state_changed(status, bd_addr, state);
|
|
}
|