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

Commit 4a83dc0f authored by Myles Watson's avatar Myles Watson
Browse files

Use check functions for Disconnect 

Remove TODOs for checking DisconnectStatusView and
ResetFailedContactCounterCompleteView

Tag: #gd-refactor
Bug: 145832107
Test: atest bluetooth_test_gd
Test: gd/cert/run --host
Change-Id: I03daaf785ad865b58fd9d14527da386b3dcf301c
parent 0e7f0dec

system/gd/hci/acl_manager/classic_acl_connection.cc

+2 −2
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ void ClassicAclConnection::RegisterCallbacks(ConnectionManagementCallbacks* call 
bool ClassicAclConnection::Disconnect(DisconnectReason reason) {

  acl_connection_interface_->EnqueueCommand(

      DisconnectBuilder::Create(handle_, reason),

      pimpl_->tracker.client_handler_->BindOnce([](CommandStatusView status) { /* TODO: check? */ }));

      pimpl_->tracker.client_handler_->BindOnce(&check_command_status<DisconnectStatusView>));

  return true;

}
@@ -486,7 +486,7 @@ bool ClassicAclConnection::ReadFailedContactCounter() { 
bool ClassicAclConnection::ResetFailedContactCounter() {

  acl_connection_interface_->EnqueueCommand(

      ResetFailedContactCounterBuilder::Create(handle_),

      pimpl_->tracker.client_handler_->BindOnce([](CommandCompleteView view) { /* TODO: check? */ }));

      pimpl_->tracker.client_handler_->BindOnce(&check_command_complete<ResetFailedContactCounterCompleteView>));

  return true;

}

system/gd/hci/acl_manager/classic_impl.h

+4 −4
Original line number Diff line number Diff line
@@ -292,8 +292,8 @@ struct classic_impl : public DisconnectorForLe, public security::ISecurityManage 
      return;

    }

    std::unique_ptr<CreateConnectionCancelBuilder> packet = CreateConnectionCancelBuilder::Create(address);

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

                                              handler_->BindOnce([](CommandCompleteView complete) { /* TODO */ }));

    acl_connection_interface_->EnqueueCommand(

        std::move(packet), handler_->BindOnce(&check_command_complete<CreateConnectionCancelCompleteView>));

  }



  void master_link_key(KeyFlag key_flag) {
@@ -482,8 +482,8 @@ struct classic_impl : public DisconnectorForLe, public security::ISecurityManage 
  }



  void reject_connection(std::unique_ptr<RejectConnectionRequestBuilder> builder) {

    acl_connection_interface_->EnqueueCommand(std::move(builder),

                                              handler_->BindOnce([](CommandStatusView status) { /* TODO: check? */ }));

    acl_connection_interface_->EnqueueCommand(

        std::move(builder), handler_->BindOnce(&check_command_status<RejectConnectionRequestStatusView>));

  }



  acl_connection& check_and_get_connection(uint16_t handle) {