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

Commit 6ce0a09d authored by Chris Manton's avatar Chris Manton Committed by Automerger Merge Worker
Browse files

legacy: is_gd_enabled is always true am: b3849d0e 

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/1914577

Change-Id: Ia3c121ed64443b91320463d70201f7cde705a0de
parents 86486d0b b3849d0e

system/main/shim/stack.cc

+7 −11
Original line number Diff line number Diff line
@@ -144,9 +144,7 @@ void Stack::StartEverything() { 
  modules.add<hci::VendorSpecificEventManager>();



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

  if (common::init_flags::gd_acl_is_enabled()) {

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

  }

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

    modules.add<l2cap::classic::L2capClassicModule>();

    modules.add<l2cap::le::L2capLeModule>();
@@ -184,14 +182,12 @@ void Stack::StartEverything() { 
    btm_ = new Btm(stack_handler_,

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

  }

  if (common::init_flags::gd_acl_is_enabled()) {

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

    acl_ = new legacy::Acl(

        stack_handler_, legacy::GetAclInterface(),

        controller_get_interface()->get_ble_acceptlist_size(),

        controller_get_interface()->get_ble_resolving_list_max_size());

  }

  }

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

    bluetooth::shim::hci_on_reset_complete();

  }
@@ -244,7 +240,7 @@ void Stack::Stop() { 
  }



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

  if (common::init_flags::gd_acl_is_enabled() && acl_ != nullptr) {

  if (acl_ != nullptr) {

    acl_->FinalShutdown();

    delete acl_;

    acl_ = nullptr;