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

Commit eb96cb05 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "HCI: Add an LeAclManagerFacade and tests"

parents 0bdc2d61 f27f345b

system/gd/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -403,6 +403,7 @@ filegroup { 
        "hci/facade/facade.proto",

        "hci/facade/acl_manager_facade.proto",

        "hci/facade/controller_facade.proto",

        "hci/facade/le_acl_manager_facade.proto",

        "hci/facade/le_advertising_manager_facade.proto",

        "hci/facade/le_scanning_manager_facade.proto",

        "neighbor/facade/facade.proto",
@@ -434,6 +435,8 @@ genrule { 
        "hci/facade/acl_manager_facade.pb.h",

        "hci/facade/controller_facade.grpc.pb.h",

        "hci/facade/controller_facade.pb.h",

        "hci/facade/le_acl_manager_facade.grpc.pb.h",

        "hci/facade/le_acl_manager_facade.pb.h",

        "hci/facade/le_advertising_manager_facade.grpc.pb.h",

        "hci/facade/le_advertising_manager_facade.pb.h",

        "hci/facade/le_scanning_manager_facade.grpc.pb.h",
@@ -470,6 +473,8 @@ genrule { 
        "hci/facade/acl_manager_facade.pb.cc",

        "hci/facade/controller_facade.grpc.pb.cc",

        "hci/facade/controller_facade.pb.cc",

        "hci/facade/le_acl_manager_facade.grpc.pb.cc",

        "hci/facade/le_acl_manager_facade.pb.cc",

        "hci/facade/le_advertising_manager_facade.grpc.pb.cc",

        "hci/facade/le_advertising_manager_facade.pb.cc",

        "hci/facade/le_scanning_manager_facade.grpc.pb.cc",
@@ -521,6 +526,8 @@ genrule { 
        "hci/facade/acl_manager_facade_pb2.py",

        "hci/facade/controller_facade_pb2_grpc.py",

        "hci/facade/controller_facade_pb2.py",

        "hci/facade/le_acl_manager_facade_pb2_grpc.py",

        "hci/facade/le_acl_manager_facade_pb2.py",

        "hci/facade/le_advertising_manager_facade_pb2_grpc.py",

        "hci/facade/le_advertising_manager_facade_pb2.py",

        "hci/facade/le_scanning_manager_facade_pb2_grpc.py",

system/gd/cert/cert_testcases_facade_only

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ SimpleSecurityTest 
NeighborTest

ControllerTest

AclManagerTest

LeAclManagerTest

system/gd/cert/gd_device.py

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ from hal import facade_pb2_grpc as hal_facade_pb2_grpc 
from hci.facade import facade_pb2_grpc as hci_facade_pb2_grpc

from hci.facade import acl_manager_facade_pb2_grpc

from hci.facade import controller_facade_pb2_grpc

from hci.facade import le_acl_manager_facade_pb2_grpc

from hci.facade import le_advertising_manager_facade_pb2_grpc

from hci.facade import le_scanning_manager_facade_pb2_grpc

from neighbor.facade import facade_pb2_grpc as neighbor_facade_pb2_grpc
@@ -84,6 +85,8 @@ class GdDevice(GdDeviceBase): 
            self.grpc_channel)

        self.hci_acl_manager = acl_manager_facade_pb2_grpc.AclManagerFacadeStub(

            self.grpc_channel)

        self.hci_le_acl_manager = le_acl_manager_facade_pb2_grpc.LeAclManagerFacadeStub(

            self.grpc_channel)

        self.hci_controller = controller_facade_pb2_grpc.ControllerFacadeStub(

            self.grpc_channel)

        self.hci_le_advertising_manager = le_advertising_manager_facade_pb2_grpc.LeAdvertisingManagerFacadeStub(

system/gd/facade/grpc_root_server.cc

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include "hci/facade/acl_manager_facade.h"

#include "hci/facade/controller_facade.h"

#include "hci/facade/facade.h"

#include "hci/facade/le_acl_manager_facade.h"

#include "hci/facade/le_advertising_manager_facade.h"

#include "hci/facade/le_scanning_manager_facade.h"

#include "l2cap/classic/facade.h"
@@ -68,6 +69,7 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        modules.add<::bluetooth::hci::facade::HciLayerFacadeModule>();

        modules.add<::bluetooth::hci::facade::AclManagerFacadeModule>();

        modules.add<::bluetooth::hci::facade::ControllerFacadeModule>();

        modules.add<::bluetooth::hci::facade::LeAclManagerFacadeModule>();

        modules.add<::bluetooth::hci::facade::LeAdvertisingManagerFacadeModule>();

        modules.add<::bluetooth::hci::facade::LeScanningManagerFacadeModule>();

        modules.add<::bluetooth::neighbor::facade::NeighborFacadeModule>();

system/gd/hci/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ filegroup { 
        "facade/facade.cc",

        "facade/acl_manager_facade.cc",

        "facade/controller_facade.cc",

        "facade/le_acl_manager_facade.cc",

        "facade/le_advertising_manager_facade.cc",

        "facade/le_scanning_manager_facade.cc",

    ],