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

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

Merge "[GD-Controller] Enable SSP controller when security layer is not... 

Merge "[GD-Controller] Enable SSP controller when security layer is not enabled" am: 094d734d am: 704a7eab am: 57004b1b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iacb37fca4928a22e7e0fe5e6b751a78171ef3aed
parents bac3b580 57004b1b

system/gd/hci/controller.cc

+11 −0
Original line number Diff line number Diff line
@@ -43,6 +43,10 @@ struct Controller::impl { 
    le_set_event_mask(kDefaultLeEventMask);

    set_event_mask(kDefaultEventMask);

    write_le_host_support(Enable::ENABLED);

    // SSP is managed by security layer once enabled

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

      write_simple_pairing_mode(Enable::ENABLED);

    }

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

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

    hci_->EnqueueCommand(ReadLocalVersionInformationBuilder::Create(),
@@ -448,6 +452,13 @@ struct Controller::impl { 
        module_.GetHandler()->BindOnceOn(this, &Controller::impl::check_status<WriteLeHostSupportCompleteView>));

  }



  void write_simple_pairing_mode(Enable enable) {

    std::unique_ptr<WriteSimplePairingModeBuilder> packet = WriteSimplePairingModeBuilder::Create(enable);

    hci_->EnqueueCommand(

        std::move(packet),

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

  }



  void reset() {

    std::unique_ptr<ResetBuilder> packet = ResetBuilder::Create();

    hci_->EnqueueCommand(std::move(packet),