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

Commit 4969321b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Handle remote connection parameter request" am: 95d43bc5 

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

Change-Id: I49d07ef7d59d9b312b01caaa1a17944d77d60212
parents 57877ff9 95d43bc5

system/gd/hci/acl_manager/le_impl.h

+24 −0
Original line number Diff line number Diff line
@@ -90,6 +90,9 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
      case SubeventCode::DATA_LENGTH_CHANGE:

        on_data_length_change(event_packet);

        break;

      case SubeventCode::REMOTE_CONNECTION_PARAMETER_REQUEST:

        on_remote_connection_parameter_request(event_packet);

        break;

      default:

        LOG_ALWAYS_FATAL("Unhandled event code %s", SubeventCodeText(code).c_str());

    }
@@ -275,6 +278,27 @@ struct le_impl : public bluetooth::hci::LeAddressManagerCallback { 
        data_length_view.GetMaxRxTime());

  }



  void on_remote_connection_parameter_request(LeMetaEventView view) {

    auto request_view = LeRemoteConnectionParameterRequestView::Create(view);

    if (!request_view.IsValid()) {

      LOG_ERROR("Invalid packet");

      return;

    }



    // TODO: this is blindly accepting any parameters, just so we don't hang connection

    // have proper parameter negotiation

    le_acl_connection_interface_->EnqueueCommand(

        LeRemoteConnectionParameterRequestReplyBuilder::Create(

            request_view.GetConnectionHandle(),

            request_view.GetIntervalMin(),

            request_view.GetIntervalMax(),

            request_view.GetLatency(),

            request_view.GetTimeout(),

            0,

            0),

        handler_->BindOnce([](CommandCompleteView status) {}));

  }



  void add_device_to_connect_list(AddressWithType address_with_type) {

    AddressType address_type = address_with_type.GetAddressType();

    if (!address_manager_registered) {

system/gd/hci/le_acl_connection_interface.h

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ constexpr SubeventCode LeConnectionManagementEvents[] = { 
    SubeventCode::CONNECTION_UPDATE_COMPLETE,

    SubeventCode::PHY_UPDATE_COMPLETE,

    SubeventCode::DATA_LENGTH_CHANGE,

    SubeventCode::REMOTE_CONNECTION_PARAMETER_REQUEST,

};



typedef CommandInterface<LeConnectionManagementCommandBuilder> LeAclConnectionInterface;