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
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc
index d781a13..bc59694 100644
--- a/system/btif/src/btif_dm.cc
+++ b/system/btif/src/btif_dm.cc
@@ -1123,22 +1123,14 @@
break;
case HCI_ERR_PAIRING_NOT_ALLOWED:
- if (!bluetooth::shim::is_gd_security_enabled()) {
- is_bonded_device_removed = (btif_storage_remove_bonded_device(
- &bd_addr) == BT_STATUS_SUCCESS);
- } else {
- is_bonded_device_removed = true;
- }
+ is_bonded_device_removed = false;
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:
- is_bonded_device_removed = (bluetooth::shim::is_gd_security_enabled())
- ? true
- : (btif_storage_remove_bonded_device(
- &bd_addr) == BT_STATUS_SUCCESS);
+ is_bonded_device_removed = false;
[[fallthrough]];
case HCI_ERR_HOST_REJECT_SECURITY:
case HCI_ERR_ENCRY_MODE_NOT_ACCEPTABLE:
@@ -1169,10 +1161,7 @@
/* Remove Device as bonded in nvram as authentication failed */
BTIF_TRACE_DEBUG("%s(): removing hid pointing device from nvram",
__func__);
- is_bonded_device_removed = (bluetooth::shim::is_gd_security_enabled())
- ? true
- : (btif_storage_remove_bonded_device(
- &bd_addr) == BT_STATUS_SUCCESS);
+ is_bonded_device_removed = false;
}
// Report bond state change to java only if we are bonding to a device or
// a device is removed from the pairing list.