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

Commit d94d5fa2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Queue secure L2CAP connection requests while encryption is pending" into tm-qpr-dev

parents 858ba7b3 95f2eebe

system/gd/common/init_flags.fbs

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ table InitFlagsData { 
    // is_debug_logging_enabled_for_tag -- skipped in dumpsys

    logging_debug_enabled_for_all_is_enabled:bool (privacy:"Any");

    pass_phy_update_callback_is_enabled:bool (privacy:"Any");

    queue_l2cap_coc_while_encrypting_is_enabled:bool (privacy:"Any");

    sdp_serialization_is_enabled:bool (privacy:"Any");

    sdp_skip_rnr_if_known_is_enabled:bool (privacy:"Any");

    trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled:bool (privacy:"Any");

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  // is_debug_logging_enabled_for_tag -- skipped in dumpsys

  builder.add_logging_debug_enabled_for_all_is_enabled(initFlags::logging_debug_enabled_for_all_is_enabled());

  builder.add_pass_phy_update_callback_is_enabled(initFlags::pass_phy_update_callback_is_enabled());

  builder.add_queue_l2cap_coc_while_encrypting_is_enabled(initFlags::queue_l2cap_coc_while_encrypting_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_trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled(

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

+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ init_flags!( 
        irk_rotation,

        logging_debug_enabled_for_all,

        pass_phy_update_callback = true,

        queue_l2cap_coc_while_encrypting = true,

        sdp_serialization = true,

        sdp_skip_rnr_if_known = true,

        trigger_advertising_callbacks_on_first_resume_after_pause = true,

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ mod ffi { 
        fn is_debug_logging_enabled_for_tag(tag: &str) -> bool;

        fn logging_debug_enabled_for_all_is_enabled() -> bool;

        fn pass_phy_update_callback_is_enabled() -> bool;

        fn queue_l2cap_coc_while_encrypting_is_enabled() -> bool;

        fn sdp_serialization_is_enabled() -> bool;

        fn sdp_skip_rnr_if_known_is_enabled() -> bool;

        fn trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled() -> bool;

system/stack/btm/btm_ble.cc

+9 −2
Original line number Diff line number Diff line
@@ -991,10 +991,17 @@ tL2CAP_LE_RESULT_CODE btm_ble_start_sec_check(const RawAddress& bd_addr, 
  }



  if (ble_sec_act == BTM_BLE_SEC_NONE) {

    if (bluetooth::common::init_flags::queue_l2cap_coc_while_encrypting_is_enabled()) {

      if (sec_act != BTM_SEC_ENC_PENDING) {

        return result;

      }



    } else {

      return result;

    }

  } else {

    l2cble_update_sec_act(bd_addr, sec_act);

  }



  BTM_SetEncryption(bd_addr, BT_TRANSPORT_LE, p_callback, p_ref_data,

                    ble_sec_act);