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

Commit 08e96165 authored by Chris Manton's avatar Chris Manton
Browse files

Remove unused flag gd_core_is_enabled 

Bug: 197150934
Bug: 290844204
Test: m .

Change-Id: I2b76592d60aaac48e6dc061bcc05d6d62c514655
parent 22cd0eed

system/gd/hci/controller.cc

+0 −3
Original line number Diff line number Diff line
@@ -205,9 +205,6 @@ struct Controller::impl { 
  }



  void Stop() {

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

      hci_->UnregisterEventHandler(EventCode::NUMBER_OF_COMPLETED_PACKETS);

    }

    hci_ = nullptr;

  }

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

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

        gatt_robust_caching_client = true,

        gatt_robust_caching_server,

        gd_core,

        gd_l2cap,

        hci_adapter: i32,

        hfp_dynamic_version = true,

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

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

        fn gatt_robust_caching_client_is_enabled() -> bool;

        fn gatt_robust_caching_server_is_enabled() -> bool;

        fn gd_core_is_enabled() -> bool;

        fn gd_l2cap_is_enabled() -> bool;

        fn get_default_log_level() -> i32;

        fn get_hci_adapter() -> i32;

system/main/shim/stack.cc

+10 −33
Original line number Diff line number Diff line
@@ -100,47 +100,26 @@ void Stack::StartEverything() { 
  modules.add<hci::MsftExtensionManager>();

  modules.add<hci::LeScanningManager>();

  modules.add<hci::DistanceMeasurementManager>();

  if (common::init_flags::gd_core_is_enabled()) {

    modules.add<att::AttModule>();

    modules.add<neighbor::ConnectabilityModule>();

    modules.add<neighbor::DiscoverabilityModule>();

    modules.add<neighbor::InquiryModule>();

    modules.add<neighbor::NameDbModule>();

    modules.add<neighbor::PageModule>();

    modules.add<neighbor::ScanModule>();

    modules.add<storage::StorageModule>();

  }

  Start(&modules);

  is_running_ = true;

  // Make sure the leaf modules are started

  ASSERT(stack_manager_.GetInstance<storage::StorageModule>() != nullptr);

  ASSERT(stack_manager_.GetInstance<shim::Dumpsys>() != nullptr);

  if (common::init_flags::gd_core_is_enabled()) {

    btm_ = new Btm(stack_handler_,

                   stack_manager_.GetInstance<neighbor::InquiryModule>());

  }

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

  if (stack_manager_.IsStarted<hci::Controller>()) {

    acl_ = new legacy::Acl(

        stack_handler_, legacy::GetAclInterface(),

        controller_get_interface()->get_ble_acceptlist_size(),

        controller_get_interface()->get_ble_resolving_list_max_size());

  } else {

      LOG_ERROR(

          "Unable to create shim ACL layer as Controller has not started");

    }

    LOG_ERROR("Unable to create shim ACL layer as Controller has not started");

  }



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

  bluetooth::shim::hci_on_reset_complete();

  }



  bluetooth::shim::init_advertising_manager();

  bluetooth::shim::init_scanning_manager();

  bluetooth::shim::init_distance_measurement_manager();



  if (common::init_flags::gd_l2cap_is_enabled() &&

      !common::init_flags::gd_core_is_enabled()) {

  if (common::init_flags::gd_l2cap_is_enabled()) {

    L2CA_UseLegacySecurityModule();

  }

}
@@ -160,9 +139,7 @@ void Stack::Start(ModuleList* modules) { 


void Stack::Stop() {

  std::lock_guard<std::recursive_mutex> lock(mutex_);

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

  bluetooth::shim::hci_on_shutting_down();

  }



  // Make sure gd acl flag is enabled and we started it up

  if (acl_ != nullptr) {