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

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

Merge "Controller: Don't set deprecated Host bit" am: fb2ec232 

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

Change-Id: I3c3950a5b5b92a888981e3963f5c62eac9655bcf
parents 28790525 fb2ec232

system/gd/hci/controller.cc

+7 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ struct Controller::impl { 


    le_set_event_mask(kDefaultLeEventMask);

    set_event_mask(kDefaultEventMask);

    write_le_host_support(Enable::ENABLED);

    write_le_host_support(Enable::ENABLED, Enable::DISABLED);

    hci_->EnqueueCommand(ReadLocalNameBuilder::Create(),

                         handler->BindOnceOn(this, &Controller::impl::read_local_name_complete_handler));

    hci_->EnqueueCommand(ReadLocalVersionInformationBuilder::Create(),
@@ -490,10 +490,12 @@ struct Controller::impl { 
                                                this, &Controller::impl::check_status<SetEventMaskCompleteView>));

  }



  void write_le_host_support(Enable enable) {

    // Since Bluetooth Core Spec 4.1, this bit should be 0, but some controllers still require it

    Enable simultaneous_le_host = Enable::ENABLED;

    std::unique_ptr<WriteLeHostSupportBuilder> packet = WriteLeHostSupportBuilder::Create(enable, simultaneous_le_host);

  void write_le_host_support(Enable enable, Enable deprecated_host_bit) {

    if (deprecated_host_bit == Enable::ENABLED) {

      // Since Bluetooth Core Spec 4.1, this bit should be 0

      LOG_WARN("Setting deprecated Simultaneous LE BR/EDR Host bit");

    }

    std::unique_ptr<WriteLeHostSupportBuilder> packet = WriteLeHostSupportBuilder::Create(enable, deprecated_host_bit);

    hci_->EnqueueCommand(

        std::move(packet),

        module_.GetHandler()->BindOnceOn(this, &Controller::impl::check_status<WriteLeHostSupportCompleteView>));