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

Commit 78e7fe3c authored by Hansong Zhang's avatar Hansong Zhang
Browse files

L2CAP: Move DynamicChannel API to common 

DynamicChannel API is same for both classic and LE

Bug: 144503952
Test: bluetooth_test_gd and run_cert.sh
Change-Id: Ie29ff5a1834d13f2e684f70d9b1333002f5bfc43
parent 4b7081de

system/gd/l2cap/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ filegroup { 
    name: "BluetoothL2capSources",

    srcs: [

        "fcs.cc",

        "classic/dynamic_channel.cc",

        "classic/dynamic_channel_manager.cc",

        "classic/dynamic_channel_service.cc",

        "classic/fixed_channel.cc",
@@ -15,6 +14,7 @@ filegroup { 
        "classic/internal/link_manager.cc",

        "classic/internal/signalling_manager.cc",

        "classic/l2cap_classic_module.cc",

        "dynamic_channel.cc",

        "internal/basic_mode_channel_data_controller.cc",

        "internal/data_pipeline_manager.cc",

        "internal/dynamic_channel_allocator.cc",

system/gd/l2cap/classic/dynamic_channel_manager.h

+1 −1
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 


#include "hci/acl_manager.h"

#include "hci/address.h"

#include "l2cap/classic/dynamic_channel.h"

#include "l2cap/classic/dynamic_channel_configuration_option.h"

#include "l2cap/classic/dynamic_channel_service.h"

#include "l2cap/dynamic_channel.h"

#include "l2cap/l2cap_packets.h"

#include "l2cap/psm.h"

#include "l2cap/security_policy.h"

system/gd/l2cap/classic/internal/dynamic_channel_service_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -18,10 +18,10 @@ 


#include "common/bind.h"



#include "l2cap/classic/dynamic_channel.h"

#include "l2cap/classic/dynamic_channel_configuration_option.h"

#include "l2cap/classic/dynamic_channel_manager.h"

#include "l2cap/classic/dynamic_channel_service.h"

#include "l2cap/dynamic_channel.h"



namespace bluetooth {

namespace l2cap {

system/gd/l2cap/classic/dynamic_channel.cc→system/gd/l2cap/dynamic_channel.cc

+1 −3
Original line number Diff line number Diff line
@@ -14,13 +14,12 @@ 
 * limitations under the License.

 */



#include "l2cap/classic/dynamic_channel.h"

#include "l2cap/dynamic_channel.h"

#include "common/bind.h"

#include "l2cap/internal/dynamic_channel_impl.h"



namespace bluetooth {

namespace l2cap {

namespace classic {



hci::Address DynamicChannel::GetDevice() const {

  return impl_->GetDevice();
@@ -40,6 +39,5 @@ common::BidiQueueEnd<packet::BasePacketBuilder, packet::PacketView<packet::kLitt 
DynamicChannel::GetQueueUpEnd() const {

  return impl_->GetQueueUpEnd();

}

}  // namespace classic

}  // namespace l2cap

}  // namespace bluetooth
 
 No newline at end of file

system/gd/l2cap/classic/dynamic_channel.h→system/gd/l2cap/dynamic_channel.h

+0 −3
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ namespace internal { 
class DynamicChannelImpl;

}  // namespace internal



namespace classic {



/**

 * L2CAP Dynamic channel object. User needs to call Close() when user no longer wants to use it. Otherwise the link

 * won't be disconnected.
@@ -77,6 +75,5 @@ class DynamicChannel { 
  os::Handler* l2cap_handler_;

};



}  // namespace classic

}  // namespace l2cap

}  // namespace bluetooth