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

Commit db23ce91 authored by Myles Watson's avatar Myles Watson
Browse files

Implement Classic scanning facade 

Bug: 143568835
Test: Neighbor module tests
Change-Id: Ibb479bceba349bd1fc230fb3d95f16a86d098ff4
parent 3189c62e

system/gd/Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ cc_binary { 
        ":BluetoothFacade_hci_hal",

        ":BluetoothFacade_hci_layer",

        ":BluetoothFacade_l2cap_layer",

        ":BluetoothFacade_neighbor",

        ":BluetoothFacade_security_layer",

    ],

    generated_headers: [
@@ -399,6 +400,7 @@ filegroup { 
        "hal/facade.proto",

        "hci/facade/facade.proto",

        "hci/facade/le_advertising_manager_facade.proto",

        "neighbor/facade/facade.proto",

        "l2cap/classic/facade.proto",

        "security/facade.proto",

    ],
@@ -427,6 +429,8 @@ genrule { 
        "hci/facade/le_advertising_manager_facade.pb.h",

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

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

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

        "neighbor/facade/facade.pb.h",

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

        "security/facade.pb.h",

    ],
@@ -455,6 +459,8 @@ genrule { 
        "hci/facade/le_advertising_manager_facade.pb.cc",

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

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

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

        "neighbor/facade/facade.pb.cc",

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

        "security/facade.pb.cc",

    ],
@@ -474,6 +480,7 @@ genrule { 
        "touch $(genDir)/hci/cert/__init__.py; " +

        "touch $(genDir)/l2cap/classic/__init__.py; " +

        "touch $(genDir)/l2cap/classic/cert/__init__.py; " +

        "touch $(genDir)/neighbor/facade/__init__.py; " +

        "touch $(genDir)/security/__init__.py; ",

    srcs: [

        ":BluetoothFacadeProto",
@@ -498,6 +505,9 @@ genrule { 
        "l2cap/classic/__init__.py",

        "l2cap/classic/facade_pb2_grpc.py",

        "l2cap/classic/facade_pb2.py",

        "neighbor/facade/__init__.py",

        "neighbor/facade/facade_pb2_grpc.py",

        "neighbor/facade/facade_pb2.py",

        "hci/cert/__init__.py",

        "hci/cert/api_pb2_grpc.py",

        "hci/cert/api_pb2.py",

system/gd/cert/cert_testcases_facade_only

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ SimpleHalTest 
DirectHciTest

LeAdvertisingManagerTest

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 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
@@ -80,5 +81,7 @@ class GdDevice(GdDeviceBase): 
            self.grpc_channel)

        self.hci_le_advertising_manager = le_advertising_manager_facade_pb2_grpc.LeAdvertisingManagerFacadeStub(

            self.grpc_channel)

        self.neighbor = neighbor_facade_pb2_grpc.NeighborFacadeStub(

            self.grpc_channel)

        self.security = security_facade_pb2_grpc.SecurityModuleFacadeStub(

            self.grpc_channel)

system/gd/facade/grpc_root_server.cc

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

#include "hci/facade/le_advertising_manager_facade.h"

#include "l2cap/classic/facade.h"

#include "neighbor/facade/facade.h"

#include "os/log.h"

#include "os/thread.h"

#include "security/facade.h"
@@ -59,6 +60,7 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        modules.add<::bluetooth::facade::ReadOnlyPropertyServerModule>();

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

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

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

        break;

      case BluetoothModule::L2CAP:

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

system/gd/neighbor/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -17,3 +17,9 @@ filegroup { 
    ],

}



filegroup {

    name: "BluetoothFacade_neighbor",

    srcs: [

        "facade/facade.cc",

    ],

}