OSDN Git Service

L2capTest: Remove unused classic facade
authorHansong Zhang <hsz@google.com>
Thu, 5 Mar 2020 20:22:53 +0000 (12:22 -0800)
committerHansong Zhang <hsz@google.com>
Thu, 5 Mar 2020 20:22:53 +0000 (12:22 -0800)
Test: cert/run --host
Change-Id: Id60428b7491123de02b8dff17d28c7e2f6a6d94d

gd/l2cap/classic/facade.cc
gd/l2cap/classic/facade.proto

index 1898be7..64e0068 100644 (file)
@@ -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<std::mutex> lock(channel_map_mutex_);
index b5faf03..758f568 100644 (file)
@@ -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;
 }