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

Commit abdf101a authored by William Escande's avatar William Escande
Browse files

BT5.3 Subrating -- feature flags 

Bug: 248126637
Test: build
Change-Id: Idca8b425dc907b6194c891549a6d011a5700690d
parent bb2af9b3

system/gd/common/init_flags.fbs

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

    sdp_skip_rnr_if_known_is_enabled:bool (privacy:"Any");

    set_min_encryption_is_enabled:bool (privacy:"Any");

    subrating_is_enabled:bool (privacy:"Any");

    trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled:bool (privacy:"Any");

}

// LINT.ThenChange(/system/gd/dumpsys/init_flags.cc)

system/gd/dumpsys/init_flags.cc

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ flatbuffers::Offset<bluetooth::common::InitFlagsData> bluetooth::dumpsys::InitFl 
  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_set_min_encryption_is_enabled(bluetooth::common::init_flags::set_min_encryption_is_enabled());

  builder.add_subrating_is_enabled(initFlags::subrating_is_enabled());

  builder.add_trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled(

      initFlags::trigger_advertising_callbacks_on_first_resume_after_pause_is_enabled());

system/gd/hci/controller.cc

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

    }



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

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

        module_.SupportsBleConnectionSubrating()) {

      hci_->EnqueueCommand(

          LeSetHostFeatureBuilder::Create(

              LeHostFeatureBits::CONNECTION_SUBRATING_HOST_SUPPORT, Enable::ENABLED),

system/gd/hci/controller.h

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


#pragma once



#include "common/init_flags.h"

#include "hci/address.h"

#include "hci/hci_packets.h"

#include "hci/le_rand_callback.h"
@@ -213,6 +214,9 @@ class Controller : public Module { 
  static constexpr uint64_t kLeEventMask41 = 0x000000000000003f;



  static uint64_t 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

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

        sdp_skip_rnr_if_known = true,

        set_min_encryption = true,

        subrating = true,

        trigger_advertising_callbacks_on_first_resume_after_pause = true,

    }

    // extra_fields are not a 1 to 1 match with "INIT_*" flags