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

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

Merge changes I06aadb55,I2c5b2bdc 

* changes:
  AclManagerFacade
  HCI Controller tests
parents 5df0591b bdfc3a0f

system/gd/Android.bp

+14 −0
Original line number Diff line number Diff line
@@ -399,6 +399,8 @@ filegroup { 
        "facade/rootservice.proto",

        "hal/facade.proto",

        "hci/facade/facade.proto",

        "hci/facade/acl_manager_facade.proto",

        "hci/facade/controller_facade.proto",

        "hci/facade/le_advertising_manager_facade.proto",

        "hci/facade/le_scanning_manager_facade.proto",

        "neighbor/facade/facade.proto",
@@ -426,6 +428,10 @@ genrule { 
        "hal/facade.pb.h",

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

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

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

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

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

        "hci/facade/controller_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",
@@ -458,6 +464,10 @@ genrule { 
        "hal/facade.pb.cc",

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

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

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

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

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

        "hci/facade/controller_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",
@@ -505,6 +515,10 @@ genrule { 
        "hci/facade/__init__.py",

        "hci/facade/facade_pb2_grpc.py",

        "hci/facade/facade_pb2.py",

        "hci/facade/acl_manager_facade_pb2_grpc.py",

        "hci/facade/acl_manager_facade_pb2.py",

        "hci/facade/controller_facade_pb2_grpc.py",

        "hci/facade/controller_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

+2 −0
Original line number Diff line number Diff line
@@ -5,3 +5,5 @@ LeAdvertisingManagerTest 
LeScanningManagerTest

SimpleSecurityTest

NeighborTest

ControllerTest

AclManagerTest

system/gd/cert/gd_device.py

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ from facade import rootservice_pb2_grpc as facade_rootservice_pb2_grpc 
from gd_device_base import GdDeviceBase, GdDeviceConfigError, replace_vars

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_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
@@ -80,6 +82,10 @@ class GdDevice(GdDeviceBase): 
        self.hci = hci_facade_pb2_grpc.HciLayerFacadeStub(self.grpc_channel)

        self.l2cap = l2cap_facade_pb2_grpc.L2capClassicModuleFacadeStub(

            self.grpc_channel)

        self.hci_acl_manager = acl_manager_facade_pb2_grpc.AclManagerFacadeStub(

            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(

            self.grpc_channel)

        self.hci_le_scanning_manager = le_scanning_manager_facade_pb2_grpc.LeScanningManagerFacadeStub(

system/gd/facade/grpc_root_server.cc

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include "facade/rootservice.grpc.pb.h"

#include "grpc/grpc_module.h"

#include "hal/facade.h"

#include "hci/facade/acl_manager_facade.h"

#include "hci/facade/controller_facade.h"

#include "hci/facade/facade.h"

#include "hci/facade/le_advertising_manager_facade.h"

#include "hci/facade/le_scanning_manager_facade.h"
@@ -64,6 +66,8 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
      case BluetoothModule::HCI_INTERFACES:

        modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();

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

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

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

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

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

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

system/gd/hci/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ filegroup { 
    name: "BluetoothFacade_hci_layer",

    srcs: [

        "facade/facade.cc",

        "facade/acl_manager_facade.cc",

        "facade/controller_facade.cc",

        "facade/le_advertising_manager_facade.cc",

        "facade/le_scanning_manager_facade.cc",

    ],