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

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

Merge "Controller: Check if SecureConnections are supported" am: b3fa70d1 

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

Change-Id: Ib37b5f5e193f9b67edc2073df610afa985043262
parents f26e3c5f b3fa70d1

system/gd/hci/controller.cc

+9 −7
Original line number Diff line number Diff line
@@ -43,13 +43,6 @@ 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(

          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));

    hci_->EnqueueCommand(ReadLocalVersionInformationBuilder::Create(),
@@ -110,6 +103,15 @@ struct Controller::impl { 
      le_maximum_data_length_.supported_max_tx_time_ = 0;

    }



    // SSP is managed by security layer once enabled

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

      write_simple_pairing_mode(Enable::ENABLED);

      if (module_.SupportsSecureConnections()) {

        hci_->EnqueueCommand(

            WriteSecureConnectionsHostSupportBuilder::Create(Enable::ENABLED),

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

      }

    }

    if (is_supported(OpCode::LE_READ_SUGGESTED_DEFAULT_DATA_LENGTH) && module_.SupportsBlePacketExtension()) {

      hci_->EnqueueCommand(

          LeReadSuggestedDefaultDataLengthBuilder::Create(),