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

Commit 25cab075 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "L2capTest: Remove unused classic facade" am: 4a044d97 am: 6fa272ee 

Change-Id: I39abb87c5138b4fd282c6627cd43c4d033fff5ef
parents 82bbf984 6fa272ee

system/gd/l2cap/classic/facade.cc

+0 −10
Original line number Original line Diff line number Diff line
@@ -57,16 +57,6 @@ class L2capClassicModuleFacadeService : public L2capClassicModuleFacade::Service 
    return pending_connection_close_.RunLoop(context, writer);

    return pending_connection_close_.RunLoop(context, writer);

  }

  }





  ::grpc::Status Connect(::grpc::ServerContext* context, const facade::BluetoothAddress* request,

                         ::google::protobuf::Empty* response) override {

    auto fixed_channel_manager = l2cap_layer_->GetFixedChannelManager();

    hci::Address peer;

    ASSERT(hci::Address::FromString(request->address(), peer));

    fixed_channel_manager->ConnectServices(peer, common::BindOnce([](FixedChannelManager::ConnectionResult) {}),

                                           facade_handler_);

    return ::grpc::Status::OK;

  }



  ::grpc::Status SendL2capPacket(::grpc::ServerContext* context, const classic::L2capPacket* request,

  ::grpc::Status SendL2capPacket(::grpc::ServerContext* context, const classic::L2capPacket* request,

                                 SendL2capPacketResult* response) override {

                                 SendL2capPacketResult* response) override {

    std::unique_lock<std::mutex> lock(channel_map_mutex_);

    std::unique_lock<std::mutex> lock(channel_map_mutex_);

system/gd/l2cap/classic/facade.proto

+0 −7
Original line number Original line Diff line number Diff line
@@ -15,10 +15,8 @@ service L2capClassicModuleFacade { 
  rpc FetchConnectionClose(google.protobuf.Empty) returns (stream ConnectionCloseEvent) {

  rpc FetchConnectionClose(google.protobuf.Empty) returns (stream ConnectionCloseEvent) {

    // Testing Android Bluetooth stack only. Optional for other stack.

    // Testing Android Bluetooth stack only. Optional for other stack.

  }

  }

  rpc Connect(facade.BluetoothAddress) returns (google.protobuf.Empty) {}

  rpc OpenChannel(OpenChannelRequest) returns (google.protobuf.Empty) {}

  rpc OpenChannel(OpenChannelRequest) returns (google.protobuf.Empty) {}

  rpc CloseChannel(CloseChannelRequest) returns (google.protobuf.Empty) {}

  rpc CloseChannel(CloseChannelRequest) returns (google.protobuf.Empty) {}

  rpc ConfigureChannel(ConfigureChannelRequest) returns (google.protobuf.Empty) {}

  rpc SendL2capPacket(L2capPacket) returns (SendL2capPacketResult) {}

  rpc SendL2capPacket(L2capPacket) returns (SendL2capPacketResult) {}

  rpc FetchL2capData(google.protobuf.Empty) returns (stream L2capPacket) {}

  rpc FetchL2capData(google.protobuf.Empty) returns (stream L2capPacket) {}

  rpc SetDynamicChannel(SetEnableDynamicChannelRequest) returns (google.protobuf.Empty) {}

  rpc SetDynamicChannel(SetEnableDynamicChannelRequest) returns (google.protobuf.Empty) {}
@@ -49,11 +47,6 @@ message OpenChannelRequest { 
  RetransmissionFlowControlMode mode = 3;

  RetransmissionFlowControlMode mode = 3;

}

}





message ConfigureChannelRequest {

  facade.BluetoothAddress remote = 1;

  // Config

}



message CloseChannelRequest {

message CloseChannelRequest {

  uint32 psm = 1;

  uint32 psm = 1;

}

}