Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 137ee761 authored by Myles Watson's avatar Myles Watson Committed by Gerrit Code Review
Browse files

Merge "InitFlags: Remove irk_rotation" into main

parents 30d4c6ce cf05ecb2

system/btif/src/btif_storage.cc

+0 −7
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "btif/include/btif_util.h"

#include "btif/include/core_callbacks.h"

#include "btif/include/stack_manager_t.h"

#include "common/init_flags.h"

#include "hci/controller_interface.h"

#include "internal_include/bt_target.h"

#include "main/shim/entry.h"
@@ -797,12 +796,6 @@ bt_status_t btif_storage_remove_bonded_device(const RawAddress* remote_bd_addr) 


  btif_config_remove_device(bdstr);



  /* Check the length of the paired devices, and if 0 then reset IRK */

  auto paired_devices = btif_config_get_paired_devices();

  if (paired_devices.empty() && bluetooth::common::init_flags::irk_rotation_is_enabled()) {

    log::info("Last paired device removed, resetting IRK");

    BTA_DmBleResetId();

  }

  return BT_STATUS_SUCCESS;

}

system/gd/rust/common/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -210,7 +210,6 @@ init_flags!( 
        classic_discovery_only,

        dynamic_avrcp_version_enhancement = true,

        hci_adapter: i32,

        irk_rotation,

        leaudio_targeted_announcement_reconnection_mode = true,

        pbap_pse_dynamic_version_upgrade = false,

        redact_log = true,

system/gd/rust/shim/src/init_flags.rs

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ mod ffi { 
        fn classic_discovery_only_is_enabled() -> bool;

        fn dynamic_avrcp_version_enhancement_is_enabled() -> bool;

        fn get_hci_adapter() -> i32;

        fn irk_rotation_is_enabled() -> bool;

        fn leaudio_targeted_announcement_reconnection_mode_is_enabled() -> bool;

        fn pbap_pse_dynamic_version_upgrade_is_enabled() -> bool;

        fn redact_log_is_enabled() -> bool;