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

Commit c6d86fca authored by William Escande's avatar William Escande Committed by Automerger Merge Worker
Browse files

Merge "floss: Add check to determine if read encryption key size is supported"... 

Merge "floss: Add check to determine if read encryption key size is supported" am: 1a4af26b am: 45deef07

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



Change-Id: Id8ba0240c92642e278e6c2d4c23727a270cde2a6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 99d955e5 45deef07

system/device/include/controller.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -70,6 +70,7 @@ typedef struct controller_t { 
  bool (*supports_encryption_pause)(void);

  bool (*supports_encryption_pause)(void);

  bool (*supports_configure_data_path)(void);

  bool (*supports_configure_data_path)(void);

  bool (*supports_set_min_encryption_key_size)(void);

  bool (*supports_set_min_encryption_key_size)(void);

  bool (*supports_read_encryption_key_size)(void);





  bool (*supports_ble)(void);

  bool (*supports_ble)(void);

  bool (*supports_ble_packet_extension)(void);

  bool (*supports_ble_packet_extension)(void);

system/gd/common/init_flags.fbs

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

    periodic_advertising_adi_is_enabled:bool (privacy:"Any");

    private_gatt_is_enabled:bool (privacy:"Any");

    private_gatt_is_enabled:bool (privacy:"Any");

    queue_l2cap_coc_while_encrypting_is_enabled:bool (privacy:"Any");

    queue_l2cap_coc_while_encrypting_is_enabled:bool (privacy:"Any");

    read_encryption_key_size_is_enabled:bool (privacy:"Any");

    redact_log_is_enabled:bool (privacy:"Any");

    redact_log_is_enabled:bool (privacy:"Any");

    rust_event_loop_is_enabled:bool (privacy:"Any");

    rust_event_loop_is_enabled:bool (privacy:"Any");

    sdp_serialization_is_enabled:bool (privacy:"Any");

    sdp_serialization_is_enabled:bool (privacy:"Any");

system/gd/dumpsys/init_flags.cc

+2 −0
Original line number Original line Diff line number Diff line
@@ -78,6 +78,8 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  builder.add_queue_l2cap_coc_while_encrypting_is_enabled(

  builder.add_queue_l2cap_coc_while_encrypting_is_enabled(

      initFlags::queue_l2cap_coc_while_encrypting_is_enabled());

      initFlags::queue_l2cap_coc_while_encrypting_is_enabled());

  builder.add_private_gatt_is_enabled(initFlags::private_gatt_is_enabled());

  builder.add_private_gatt_is_enabled(initFlags::private_gatt_is_enabled());

  builder.add_read_encryption_key_size_is_enabled(

      bluetooth::common::init_flags::read_encryption_key_size_is_enabled());

  builder.add_redact_log_is_enabled(initFlags::redact_log_is_enabled());

  builder.add_redact_log_is_enabled(initFlags::redact_log_is_enabled());

  builder.add_rust_event_loop_is_enabled(initFlags::rust_event_loop_is_enabled());

  builder.add_rust_event_loop_is_enabled(initFlags::rust_event_loop_is_enabled());

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

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

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

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

        periodic_advertising_adi = true,

        private_gatt,

        private_gatt,

        queue_l2cap_coc_while_encrypting = true,

        queue_l2cap_coc_while_encrypting = true,

        read_encryption_key_size = true,

        redact_log = true,

        redact_log = true,

        rust_event_loop,

        rust_event_loop,

        sdp_serialization = true,

        sdp_serialization = true,

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -84,6 +84,7 @@ pub mod ffi { 
        fn controller_supports_ble_periodic_advertising_adi(c: &Controller) -> bool;

        fn controller_supports_ble_periodic_advertising_adi(c: &Controller) -> bool;

        fn controller_supports_configure_data_path(c: &Controller) -> bool;

        fn controller_supports_configure_data_path(c: &Controller) -> bool;

        fn controller_supports_set_min_encryption_key_size(c: &Controller) -> bool;

        fn controller_supports_set_min_encryption_key_size(c: &Controller) -> bool;

        fn controller_supports_read_encryption_key_size(c: &Controller) -> bool;





        fn controller_supports_reading_remote_extended_features(c: &Controller) -> bool;

        fn controller_supports_reading_remote_extended_features(c: &Controller) -> bool;

        fn controller_supports_enhanced_setup_synchronous_connection(c: &Controller) -> bool;

        fn controller_supports_enhanced_setup_synchronous_connection(c: &Controller) -> bool;