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

Commit e89faaba authored by Jack He's avatar Jack He Committed by android-build-merger
Browse files

Merge "Implement LE L2CAP Fixed Channel" 

am: f80ee977

Change-Id: Idc3a8a4f1b979bf3f10bacc48e02677299aae489
parents 7a5131bd f80ee977

system/gd/hci/acl_manager_mock.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ class MockAclConnection : public AclConnection { 
class MockAclManager : public AclManager {

 public:

  MOCK_METHOD(void, RegisterCallbacks, (ConnectionCallbacks * callbacks, os::Handler* handler), (override));

  MOCK_METHOD(void, RegisterLeCallbacks, (LeConnectionCallbacks * callbacks, os::Handler* handler), (override));

  MOCK_METHOD(void, CreateConnection, (Address address), (override));

  MOCK_METHOD(void, CreateLeConnection, (Address address, AddressType address_type), (override));

  MOCK_METHOD(void, CancelConnect, (Address address), (override));

system/gd/l2cap/Android.bp

+11 −0
Original line number Diff line number Diff line
@@ -15,7 +15,14 @@ filegroup { 
        "internal/classic_fixed_channel_impl.cc",

        "internal/classic_fixed_channel_service_manager_impl.cc",

        "internal/classic_link_manager.cc",

        "internal/le_fixed_channel_allocator.cc",

        "internal/le_fixed_channel_impl.cc",

        "internal/le_fixed_channel_service_manager_impl.cc",

        "internal/le_link_manager.cc",

        "internal/scheduler_fifo.cc",

        "le_fixed_channel.cc",

        "le_fixed_channel_manager.cc",

        "le_fixed_channel_service.cc",

    ],

}
@@ -29,6 +36,10 @@ filegroup { 
        "internal/classic_fixed_channel_impl_test.cc",

        "internal/classic_fixed_channel_service_manager_test.cc",

        "internal/classic_link_manager_test.cc",

        "internal/le_fixed_channel_allocator_test.cc",

        "internal/le_fixed_channel_impl_test.cc",

        "internal/le_fixed_channel_service_manager_test.cc",

        "internal/le_link_manager_test.cc",

        "internal/scheduler_fifo_test.cc",

        "signal_id_test.cc",

    ],

system/gd/l2cap/classic_fixed_channel_service.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ namespace l2cap { 


namespace internal {

class ClassicFixedChannelServiceManagerImpl;

}

}  // namespace internal



class ClassicFixedChannelService {

 public:

system/gd/l2cap/internal/classic_fixed_channel_impl.cc

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <unordered_map>



#include "l2cap/cid.h"

#include "l2cap/internal/classic_fixed_channel_allocator.h"

#include "l2cap/internal/classic_fixed_channel_impl.h"

#include "l2cap/internal/classic_link.h"

#include "l2cap/security_policy.h"

system/gd/l2cap/internal/classic_fixed_channel_impl.h

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include "common/bidi_queue.h"

#include "l2cap/cid.h"

#include "l2cap/classic_fixed_channel.h"

#include "l2cap/internal/classic_fixed_channel_allocator.h"

#include "os/handler.h"

#include "os/log.h"