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

Commit d0fa762c authored by Katherine Lai's avatar Katherine Lai Committed by Gerrit Code Review
Browse files

Merge "Remove legacy init flag read_encryption_key_size" into main

parents e19aa553 4c315648

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

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

        private_gatt = true,

        queue_l2cap_coc_while_encrypting = true,

        read_encryption_key_size = true,

        redact_log = true,

        rust_event_loop = true,

        sco_codec_select_lc3,

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

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

        fn private_gatt_is_enabled() -> bool;

        fn queue_l2cap_coc_while_encrypting_is_enabled() -> bool;

        fn read_encryption_key_size_is_enabled() -> bool;

        fn redact_log_is_enabled() -> bool;

        fn rust_event_loop_is_enabled() -> bool;

        fn sco_codec_select_lc3_is_enabled() -> bool;

system/stack/btu/btu_hcif.cc

+1 −2
Original line number Diff line number Diff line
@@ -937,8 +937,7 @@ static void btu_hcif_encryption_change_evt(uint8_t* p) { 


  if (status != HCI_SUCCESS || encr_enable == 0 ||

      BTM_IsBleConnection(handle) ||

      (bluetooth::common::init_flags::read_encryption_key_size_is_enabled() &&

       !controller_get_interface()->supports_read_encryption_key_size()) ||

      !controller_get_interface()->supports_read_encryption_key_size() ||

      // Skip encryption key size check when using set_min_encryption_key_size

      (bluetooth::common::init_flags::set_min_encryption_is_enabled() &&

       controller_get_interface()->supports_set_min_encryption_key_size())) {