diff options
| author | 2025-03-07 18:24:09 -0800 | |
|---|---|---|
| committer | 2025-03-07 18:24:09 -0800 | |
| commit | c41c432105dbe5ba0ceb577f23ab255707ff4633 (patch) | |
| tree | 520cddd7b0c3b2e0734d3dca693897dc0dfb69fa /system/btif | |
| parent | bdbec5c85c33660fdeb7cfc160369f5ad9896149 (diff) | |
| parent | 9a1628bacbf0bcbb86aeecab36b8fa5544869cd6 (diff) | |
Merge "Don't reset security flags after temporary pairing" into main
Diffstat (limited to 'system/btif')
| -rw-r--r-- | system/btif/src/btif_dm.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/system/btif/src/btif_dm.cc b/system/btif/src/btif_dm.cc index 6cb0bea5e0..84c7b7e1f6 100644 --- a/system/btif/src/btif_dm.cc +++ b/system/btif/src/btif_dm.cc @@ -572,7 +572,11 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr, if (pairing_cb.bond_type == BOND_TYPE_TEMPORARY) { state = BT_BOND_STATE_NONE; + } else if (com::android::bluetooth::flags::reset_security_flags_on_pairing_failure() && + state == BT_BOND_STATE_NONE) { + get_security_client_interface().BTM_SecClearSecurityFlags(bd_addr); } + log::info( "Bond state changed to state={}[0:none, 1:bonding, " "2:bonded],prev_state={}, sdp_attempts={}", @@ -581,9 +585,6 @@ static void bond_state_changed(bt_status_t status, const RawAddress& bd_addr, if (state == BT_BOND_STATE_NONE) { forget_device_from_metric_id_allocator(bd_addr); btif_config_remove_device(bd_addr.ToString()); - if (com::android::bluetooth::flags::reset_security_flags_on_pairing_failure()) { - get_security_client_interface().BTM_SecClearSecurityFlags(bd_addr); - } } else if (state == BT_BOND_STATE_BONDED) { allocate_metric_id_from_metric_id_allocator(bd_addr); if (!save_metric_id_from_metric_id_allocator(bd_addr)) { |