From 4e58f7e8937fb84f6fe9d2ce3486ab2ac7b7e280 Mon Sep 17 00:00:00 2001 From: Hansong Zhang Date: Thu, 5 Mar 2020 12:22:53 -0800 Subject: [PATCH] L2capTest: Remove unused classic facade Test: cert/run --host Change-Id: Id60428b7491123de02b8dff17d28c7e2f6a6d94d --- gd/l2cap/classic/facade.cc | 10 ---------- gd/l2cap/classic/facade.proto | 7 ------- 2 files changed, 17 deletions(-) diff --git a/gd/l2cap/classic/facade.cc b/gd/l2cap/classic/facade.cc index 1898be72c..64e00685f 100644 --- a/gd/l2cap/classic/facade.cc +++ b/gd/l2cap/classic/facade.cc @@ -57,16 +57,6 @@ class L2capClassicModuleFacadeService : public L2capClassicModuleFacade::Service 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, SendL2capPacketResult* response) override { std::unique_lock lock(channel_map_mutex_); diff --git a/gd/l2cap/classic/facade.proto b/gd/l2cap/classic/facade.proto index b5faf03df..758f56886 100644 --- a/gd/l2cap/classic/facade.proto +++ b/gd/l2cap/classic/facade.proto @@ -15,10 +15,8 @@ service L2capClassicModuleFacade { rpc FetchConnectionClose(google.protobuf.Empty) returns (stream ConnectionCloseEvent) { // 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 CloseChannel(CloseChannelRequest) returns (google.protobuf.Empty) {} - rpc ConfigureChannel(ConfigureChannelRequest) returns (google.protobuf.Empty) {} rpc SendL2capPacket(L2capPacket) returns (SendL2capPacketResult) {} rpc FetchL2capData(google.protobuf.Empty) returns (stream L2capPacket) {} rpc SetDynamicChannel(SetEnableDynamicChannelRequest) returns (google.protobuf.Empty) {} @@ -49,11 +47,6 @@ message OpenChannelRequest { RetransmissionFlowControlMode mode = 3; } -message ConfigureChannelRequest { - facade.BluetoothAddress remote = 1; - // Config -} - message CloseChannelRequest { uint32 psm = 1; } -- 2.11.0