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

Commit 5a6630e6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Chris Manton
Browse files

Merge "Check gd::controller started before shim::Acl constructed" am: 85dd9ef1 am: 418bdaaf 

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



Bug: 229432405
Tag: #refactor
Test: gd/cert/run
BYPASS_LONG_LINES_REASON: Bluetooth likes 120 lines

Change-Id: I167441f524ad489fb9877ee30ddbb8d1d5f0ee04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
(cherry picked from commit 9a80de78)
parent db8261f1

system/main/shim/stack.cc

+10 −4
Original line number Diff line number Diff line
@@ -179,11 +179,17 @@ void Stack::StartEverything() { 
                   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");

    }

  }



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

    bluetooth::shim::hci_on_reset_complete();

  }