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

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

Merge "InitFlags: Remove set_min_encryption_key_size" into main

parents 7d23cde9 86e25248

system/gd/hci/controller.cc

+1 −2
Original line number Diff line number Diff line
@@ -103,8 +103,7 @@ struct Controller::impl { 
            ReadBufferSizeBuilder::Create(),

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



    if (common::init_flags::set_min_encryption_is_enabled() &&

        is_supported(OpCode::SET_MIN_ENCRYPTION_KEY_SIZE)) {

    if (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

+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,

        set_min_encryption = true,

        subrating = true,

        use_unified_connection_manager,

        sdp_return_classic_services_when_le_discovery_fails = 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 set_min_encryption_is_enabled() -> bool;

        fn subrating_is_enabled() -> bool;

        fn use_unified_connection_manager_is_enabled() -> bool;

        fn sdp_return_classic_services_when_le_discovery_fails_is_enabled() -> bool;