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

Commit e17dbd51 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "gd HCI: Split out LeAddressInitiator" am: eb8059b5 

Change-Id: I792f2a600b6cbe540f1ccbe50814eae27870dfec
parents cfce5ff8 eb8059b5

system/gd/Android.bp

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

        "hci/facade/le_acl_manager_facade.proto",

        "hci/facade/le_advertising_manager_facade.proto",

        "hci/facade/le_initiator_address_facade.proto",

        "hci/facade/le_scanning_manager_facade.proto",

        "neighbor/facade/facade.proto",

        "l2cap/classic/facade.proto",
@@ -510,6 +511,8 @@ genrule { 
        "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_initiator_address_facade.grpc.pb.h",

        "hci/facade/le_initiator_address_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",
@@ -550,6 +553,8 @@ genrule { 
        "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_initiator_address_facade.grpc.pb.cc",

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

system/gd/cert/gd_device.py

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

from hci.facade import le_scanning_manager_facade_pb2_grpc

from l2cap.classic import facade_pb2_grpc as l2cap_facade_pb2_grpc

from l2cap.le import facade_pb2_grpc as l2cap_le_facade_pb2_grpc
@@ -225,6 +226,8 @@ class GdDeviceBase(ABC): 
        self.l2cap_le = l2cap_le_facade_pb2_grpc.L2capLeModuleFacadeStub(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_le_initiator_address = le_initiator_address_facade_pb2_grpc.LeInitiatorAddressFacadeStub(

            self.grpc_channel)

        self.hci_controller = controller_facade_pb2_grpc.ControllerFacadeStub(self.grpc_channel)

        self.hci_controller.GetMacAddressSimple = lambda: self.hci_controller.GetMacAddress(empty_proto.Empty()).address

        self.hci_controller.GetLocalNameSimple = lambda: self.hci_controller.GetLocalName(empty_proto.Empty()).name

system/gd/facade/grpc_root_server.cc

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#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_initiator_address_facade.h"

#include "hci/facade/le_scanning_manager_facade.h"

#include "hci/hci_layer.h"

#include "hci/le_advertising_manager.h"
@@ -86,12 +87,14 @@ class RootFacadeService : public ::bluetooth::facade::RootFacade::Service { 
        modules.add<::bluetooth::hci::facade::ControllerFacadeModule>();

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

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

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

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

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

        break;

      case BluetoothModule::L2CAP:

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

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

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

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

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

        modules.add<::bluetooth::l2cap::classic::L2capClassicModuleFacadeModule>();

system/gd/hci/Android.bp

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

        "facade/le_acl_manager_facade.cc",

        "facade/le_advertising_manager_facade.cc",

        "facade/le_initiator_address_facade.cc",

        "facade/le_scanning_manager_facade.cc",

    ],

}

system/gd/hci/acl_manager.cc

+0 −5
Original line number Diff line number Diff line
@@ -140,11 +140,6 @@ void AclManager::CreateLeConnection(AddressWithType address_with_type) { 
      common::BindOnce(&le_impl::create_le_connection, common::Unretained(pimpl_->le_impl_), address_with_type));

}



void AclManager::SetLeInitiatorAddress(AddressWithType initiator_address) {

  GetHandler()->Post(

      common::BindOnce(&le_impl::set_le_initiator_address, common::Unretained(pimpl_->le_impl_), initiator_address));

}



void AclManager::SetPrivacyPolicyForInitiatorAddress(LeAddressRotator::AddressPolicy address_policy,

                                                     AddressWithType fixed_address,

                                                     crypto_toolbox::Octet16 rotation_irk,