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

Commit 45374a40 authored by William Escande's avatar William Escande
Browse files

BT5.3: Set min encryption -- feature flag 

Bug: 248126637
Tag: #feature
Test: Manual end-to-end testing (need 5.3 support in controller)
Change-Id: I95987cafd0a25ea42b29a7adb9096441836dc13f
parent f53f56f0

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ table InitFlagsData { 
    redact_log_is_enabled:bool (privacy:"Any");

    sdp_serialization_is_enabled:bool (privacy:"Any");

    sdp_skip_rnr_if_known_is_enabled:bool (privacy:"Any");

    set_min_encryption_is_enabled:bool (privacy:"Any");

    trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled:bool (privacy:"Any");

}

// LINT.ThenChange(/system/gd/dumpsys/init_flags.cc)

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  builder.add_redact_log_is_enabled(initFlags::redact_log_is_enabled());

  builder.add_sdp_serialization_is_enabled(initFlags::sdp_serialization_is_enabled());

  builder.add_sdp_skip_rnr_if_known_is_enabled(initFlags::sdp_skip_rnr_if_known_is_enabled());

  builder.add_set_min_encryption_is_enabled(bluetooth::common::init_flags::set_min_encryption_is_enabled());

  builder.add_trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled(

      initFlags::trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled());

system/gd/hci/controller.cc

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ struct Controller::impl { 
    hci_->EnqueueCommand(ReadBufferSizeBuilder::Create(),

                         handler->BindOnceOn(this, &Controller::impl::read_buffer_size_complete_handler));



    if (is_supported(OpCode::SET_MIN_ENCRYPTION_KEY_SIZE)) {

    if (common::init_flags::set_min_encryption_is_enabled() && is_supported(OpCode::SET_MIN_ENCRYPTION_KEY_SIZE)) {

      hci_->EnqueueCommand(

          SetMinEncryptionKeySizeBuilder::Create(kMinEncryptionKeySize),

          handler->BindOnceOn(this, &Controller::impl::set_min_encryption_key_size_handler));

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

+1 −0
Original line number Diff line number Diff line
@@ -228,6 +228,7 @@ init_flags!( 
        redact_log = true,

        sdp_serialization = true,

        sdp_skip_rnr_if_known = true,

        set_min_encryption = true,

        trigger_advertising_callbacks_on_first_resume_after_pause = true,

    }

    // extra_fields are not a 1 to 1 match with "INIT_*" flags

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

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

        fn sdp_serialization_is_enabled() -> bool;

        fn sdp_skip_rnr_if_known_is_enabled() -> bool;

        fn set_min_encryption_is_enabled() -> bool;

        fn trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled() -> bool;

    }

}