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

Commit c3d4968f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "GD-Controller: Do not register NumberOfCompletedPacket without ACL... 

Merge "GD-Controller: Do not register NumberOfCompletedPacket without ACL layer" am: 985bca4b am: 1b6230c4 am: ea3db9b9

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1464710

Change-Id: I971ef1078325075e4652153eb37601c16af48eb6
parents 279ab8f1 ea3db9b9

system/gd/hci/controller.cc

+4 −2
Original line number Diff line number Diff line
@@ -35,8 +35,10 @@ struct Controller::impl { 
  void Start(hci::HciLayer* hci) {

    hci_ = hci;

    Handler* handler = module_.GetHandler();

    if (common::InitFlags::GdAclEnabled()) {

      hci_->RegisterEventHandler(

          EventCode::NUMBER_OF_COMPLETED_PACKETS, handler->BindOn(this, &Controller::impl::NumberOfCompletedPackets));

    }



    le_set_event_mask(kDefaultLeEventMask);

    set_event_mask(kDefaultEventMask);

system/main/shim/hci_layer.cc

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static bool event_already_registered_in_hci_layer( 
    case bluetooth::hci::EventCode::PAGE_SCAN_REPETITION_MODE_CHANGE:

    case bluetooth::hci::EventCode::MAX_SLOTS_CHANGE:

    case bluetooth::hci::EventCode::VENDOR_SPECIFIC:

      return true;

      return bluetooth::shim::is_gd_hci_enabled();

    case bluetooth::hci::EventCode::LE_META_EVENT:

    case bluetooth::hci::EventCode::DISCONNECTION_COMPLETE:

      return bluetooth::shim::is_gd_shim_enabled();
@@ -236,7 +236,7 @@ static bool event_already_registered_in_controller_layer( 
    bluetooth::hci::EventCode event_code) {

  switch (event_code) {

    case bluetooth::hci::EventCode::NUMBER_OF_COMPLETED_PACKETS:

      return bluetooth::shim::is_gd_controller_enabled();

      return bluetooth::shim::is_gd_acl_enabled();

    default:

      return false;

  }