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

Commit 19c133b9 authored by Myles Watson's avatar Myles Watson
Browse files

InitFlags: Remove subrating_is_enabled 

Bug: 248126637
Fixes: 290846301
Test: mma -j32
Flag: EXEMPT, no logical change
Change-Id: I515f5099696d6332f61ce880b32ff61aae87d02d
parent 86e25248

system/gd/hci/controller.cc

+1 −5
Original line number Diff line number Diff line
@@ -212,8 +212,7 @@ struct Controller::impl { 
              handler->BindOnceOn(this, &Controller::impl::le_set_host_feature_handler));

    }



    if (common::init_flags::subrating_is_enabled() && is_supported(OpCode::LE_SET_HOST_FEATURE) &&

        module_.SupportsBleConnectionSubrating()) {

    if (is_supported(OpCode::LE_SET_HOST_FEATURE) && module_.SupportsBleConnectionSubrating()) {

      hci_->EnqueueCommand(

              LeSetHostFeatureBuilder::Create(LeHostFeatureBits::CONNECTION_SUBRATING_HOST_SUPPORT,

                                              Enable::ENABLED),
@@ -1517,9 +1516,6 @@ bool Controller::IsSupported(bluetooth::hci::OpCode op_code) const { 
}



uint64_t Controller::MaskLeEventMask(HciVersion version, uint64_t mask) {

  if (!common::init_flags::subrating_is_enabled()) {

    mask = mask & ~(static_cast<uint64_t>(LLFeaturesBits::CONNECTION_SUBRATING_HOST_SUPPORT));

  }

  if (version >= HciVersion::V_5_3) {

    return mask;

  } else if (version >= HciVersion::V_5_2) {

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,

        subrating = true,

        use_unified_connection_manager,

        sdp_return_classic_services_when_le_discovery_fails = true,

        use_rsi_from_cached_inqiry_results = false,

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 subrating_is_enabled() -> bool;

        fn use_unified_connection_manager_is_enabled() -> bool;

        fn sdp_return_classic_services_when_le_discovery_fails_is_enabled() -> bool;

        fn use_rsi_from_cached_inqiry_results_is_enabled() -> bool;