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

Commit 6ac2ffaa authored by Myles Watson's avatar Myles Watson Committed by Automerger Merge Worker
Browse files

Merge "Controller: Set host support flag for Secure Connections" am:... 

Merge "Controller: Set host support flag for Secure Connections" am: 2259569c am: 3a88567b am: 54a34d02

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

Change-Id: Idd59443edc14bc8bd31a3999d8a7427b97670219
parents e251325b 54a34d02

system/gd/hci/controller.cc

+10 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ struct Controller::impl { 
    // SSP is managed by security layer once enabled

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

      write_simple_pairing_mode(Enable::ENABLED);

      hci_->EnqueueCommand(

          WriteSecureConnectionsHostSupportBuilder::Create(Enable::ENABLED),

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

    }

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

                         handler->BindOnceOn(this, &Controller::impl::read_local_name_complete_handler));
@@ -189,6 +192,13 @@ struct Controller::impl { 
    acl_monitor_credits_callback_ = {};

  }



  void write_secure_connections_host_support_complete_handler(CommandCompleteView view) {

    auto complete_view = WriteSecureConnectionsHostSupportCompleteView::Create(view);

    ASSERT(complete_view.IsValid());

    ErrorCode status = complete_view.GetStatus();

    ASSERT_LOG(status == ErrorCode::SUCCESS, "Status 0x%02hhx, %s", status, ErrorCodeText(status).c_str());

  }



  void read_local_name_complete_handler(CommandCompleteView view) {

    auto complete_view = ReadLocalNameCompleteView::Create(view);

    ASSERT(complete_view.IsValid());