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

Commit a61c6629 authored by Rahul Arya's avatar Rahul Arya Committed by Automerger Merge Worker
Browse files

Add flag to toggle IRK rotation am: 031dc503 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20058355



Change-Id: I6c76cdf4fcccc4eba58ff95a3e6307c3dc724b22
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a478e095 031dc503

system/btif/src/btif_storage.cc

+3 −1
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#include "btif_hh.h"

#include "btif_util.h"

#include "device/include/controller.h"

#include "gd/common/init_flags.h"

#include "osi/include/allocator.h"

#include "osi/include/compat.h"

#include "osi/include/config.h"
@@ -899,7 +900,8 @@ bt_status_t btif_storage_remove_bonded_device( 


  /* 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()) {

  if (paired_devices.empty() &&

      bluetooth::common::init_flags::irk_rotation_is_enabled()) {

    LOG_INFO("Last paired device removed, resetting IRK");

    BTA_DmBleResetId();

  }

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

+2 −1
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ init_flags!( 
        gatt_robust_caching,

        btaa_hci,

        gd_rust,

        gd_link_policy

        gd_link_policy,

        irk_rotation

    },

    dependencies: {

        gd_core => gd_security

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

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

        fn gd_rust_is_enabled() -> bool;

        fn gd_link_policy_is_enabled() -> bool;

        fn irk_rotation_is_enabled() -> bool;

    }

}