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

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

Merge "HCI: Add LE Scanning Manager test"

parents 7551ad4e 91c1ee9c

system/gd/Android.bp

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

        "hci/facade/facade.proto",

        "hci/facade/le_advertising_manager_facade.proto",

        "hci/facade/le_scanning_manager_facade.proto",

        "neighbor/facade/facade.proto",

        "l2cap/classic/facade.proto",

        "security/facade.proto",
@@ -427,6 +428,8 @@ genrule { 
        "hci/facade/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",

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

        "l2cap/classic/facade.grpc.pb.h",

        "l2cap/classic/facade.pb.h",

        "neighbor/facade/facade.grpc.pb.h",
@@ -457,6 +460,8 @@ genrule { 
        "hci/facade/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",

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

        "l2cap/classic/facade.grpc.pb.cc",

        "l2cap/classic/facade.pb.cc",

        "neighbor/facade/facade.grpc.pb.cc",
@@ -502,6 +507,8 @@ genrule { 
        "hci/facade/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",

        "hci/facade/le_scanning_manager_facade_pb2.py",

        "l2cap/classic/__init__.py",

        "l2cap/classic/facade_pb2_grpc.py",

        "l2cap/classic/facade_pb2.py",

system/gd/cert/cert_testcases_facade_only

+1 −0
Original line number Diff line number Diff line
@@ -2,5 +2,6 @@ CertSelfTest 
SimpleHalTest

DirectHciTest

LeAdvertisingManagerTest

LeScanningManagerTest

SimpleSecurityTest

NeighborTest

system/gd/cert/gd_device.py

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 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 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

from l2cap.classic import facade_pb2_grpc as l2cap_facade_pb2_grpc

from security import facade_pb2_grpc as security_facade_pb2_grpc
@@ -81,6 +82,8 @@ class GdDevice(GdDeviceBase): 
            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(

            self.grpc_channel)

        self.neighbor = neighbor_facade_pb2_grpc.NeighborFacadeStub(

            self.grpc_channel)

        self.security = security_facade_pb2_grpc.SecurityModuleFacadeStub(

system/gd/facade/grpc_root_server.cc

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "hal/facade.h"

#include "hci/facade/facade.h"

#include "hci/facade/le_advertising_manager_facade.h"

#include "hci/facade/le_scanning_manager_facade.h"

#include "l2cap/classic/facade.h"

#include "neighbor/facade/facade.h"

#include "os/log.h"
@@ -57,9 +58,14 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        modules.add<::bluetooth::hal::HciHalFacadeModule>();

        break;

      case BluetoothModule::HCI:

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

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

        break;

      case BluetoothModule::HCI_INTERFACES:

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

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

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

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

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

        break;

      case BluetoothModule::L2CAP:

system/gd/facade/rootservice.proto

+3 −2
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ service RootFacade { 
enum BluetoothModule {

  HAL = 0;

  HCI = 1;

  L2CAP = 2;

  SECURITY = 3;

  HCI_INTERFACES = 2;

  L2CAP = 3;

  SECURITY = 4;

}



message StartStackRequest {