Snap for 6038280 from 4f32a02e609361a870019fd95969180f5e6251f6 to rvc-release (09292a69) · Commits · e / os / android_packages_modules_Bluetooth

system/binder/android/bluetooth/IBluetooth.aidl

+0 −3

Original line number	Diff line number	Diff line
		@@ -106,9 +106,6 @@ interface IBluetooth
		int getSimAccessPermission(in BluetoothDevice device);
		boolean setSimAccessPermission(in BluetoothDevice device, int value);

		@UnsupportedAppUsage
		void sendConnectionStateChange(in BluetoothDevice device, int profile, int state, int prevState);

		void registerCallback(in IBluetoothCallback callback);
		void unregisterCallback(in IBluetoothCallback callback);

system/gd/Android.bp

+10 −2

Original line number	Diff line number	Diff line
		@@ -398,6 +398,7 @@ filegroup {
		"facade/rootservice.proto",
		"hal/facade.proto",
		"hci/facade.proto",
		"hci/facade/le_advertising_manager_facade.proto",
		"l2cap/classic/facade.proto",
		],
		}
		@@ -421,6 +422,8 @@ genrule {
		"hal/facade.pb.h",
		"hci/facade.grpc.pb.h",
		"hci/facade.pb.h",
		"hci/facade/le_advertising_manager_facade.grpc.pb.h",
		"hci/facade/le_advertising_manager_facade.pb.h",
		"l2cap/classic/facade.grpc.pb.h",
		"l2cap/classic/facade.pb.h",
		],
		@@ -445,6 +448,8 @@ genrule {
		"hal/facade.pb.cc",
		"hci/facade.grpc.pb.cc",
		"hci/facade.pb.cc",
		"hci/facade/le_advertising_manager_facade.grpc.pb.cc",
		"hci/facade/le_advertising_manager_facade.pb.cc",
		"l2cap/classic/facade.grpc.pb.cc",
		"l2cap/classic/facade.pb.cc",
		],
		@@ -461,6 +466,7 @@ genrule {
		"touch $(genDir)/hal/__init__.py; " +
		"touch $(genDir)/hal/cert/__init__.py; " +
		"touch $(genDir)/hci/__init__.py; " +
		"touch $(genDir)/hci/facade/__init__.py; " +
		"touch $(genDir)/hci/cert/__init__.py; " +
		"touch $(genDir)/l2cap/classic/__init__.py; " +
		"touch $(genDir)/l2cap/classic/cert/__init__.py; ",
		@@ -482,6 +488,9 @@ genrule {
		"hci/__init__.py",
		"hci/facade_pb2_grpc.py",
		"hci/facade_pb2.py",
		"hci/facade/__init__.py",
		"hci/facade/le_advertising_manager_facade_pb2_grpc.py",
		"hci/facade/le_advertising_manager_facade_pb2.py",
		"l2cap/classic/__init__.py",
		"l2cap/classic/facade_pb2_grpc.py",
		"l2cap/classic/facade_pb2.py",
		@@ -618,13 +627,12 @@ cc_defaults {
		allow_undefined_symbols: true,
		}

		cc_library{
		cc_library_host_shared{
		name: "bluetooth_packets_python3",
		defaults: [
		"gd_defaults",
		"bluetooth_py3_native_extension_defaults"
		],
		host_supported: true,
		srcs: [
		"packet/python3_module.cc",
		"l2cap/fcs.cc",

system/gd/cert/gd_base_test.py

+7 −7

Original line number	Diff line number	Diff line
		@@ -34,16 +34,16 @@ class GdBaseTestClass(BaseTestClass):
		def __init__(self, configs):
		BaseTestClass.__init__(self, configs)

		log_path_base = configs.get('log_path', '/tmp/logs')
		rootcanal_logpath = os.path.join(log_path_base, 'rootcanal_logs.txt')
		self.rootcanal_logs = open(rootcanal_logpath, 'w')
		gd_devices = self.testbed_configs.get("GdDevice")
		gd_cert_devices = self.testbed_configs.get("GdCertDevice")
		log_path_base = configs.log_path
		gd_devices = self.controller_configs.get("GdDevice")
		gd_cert_devices = self.controller_configs.get("GdCertDevice")

		self.rootcanal_running = False
		if 'rootcanal' in configs["testbed_configs"]:
		if 'rootcanal' in self.controller_configs:
		self.rootcanal_running = True
		rootcanal_config = configs["testbed_configs"]['rootcanal']
		rootcanal_logpath = os.path.join(log_path_base, 'rootcanal_logs.txt')
		self.rootcanal_logs = open(rootcanal_logpath, 'w')
		rootcanal_config = self.controller_configs['rootcanal']
		rootcanal_hci_port = str(rootcanal_config.get("hci_port", "6402"))
		self.rootcanal_process = subprocess.Popen(
		[

system/gd/cert/gd_device.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ from cert.event_stream import EventStream
		from facade import rootservice_pb2_grpc as facade_rootservice_pb2_grpc
		from hal import facade_pb2_grpc as hal_facade_pb2_grpc
		from hci import facade_pb2_grpc as hci_facade_pb2_grpc
		from hci.facade import le_advertising_manager_facade_pb2_grpc
		from l2cap.classic import facade_pb2_grpc as l2cap_facade_pb2_grpc

		ACTS_CONTROLLER_CONFIG_NAME = "GdDevice"
		@@ -71,6 +72,7 @@ class GdDevice(GdDeviceBase):
		self.hci = hci_facade_pb2_grpc.AclManagerFacadeStub(self.grpc_channel)
		self.hci_classic_security = hci_facade_pb2_grpc.ClassicSecurityManagerFacadeStub(self.grpc_channel)
		self.l2cap = l2cap_facade_pb2_grpc.L2capClassicModuleFacadeStub(self.grpc_channel)
		self.hci_le_advertising_manager = le_advertising_manager_facade_pb2_grpc.LeAdvertisingManagerFacadeStub(self.grpc_channel)

		# Event streams
		self.hal.hci_event_stream = EventStream(self.hal.FetchHciEvent)

system/gd/facade/common.proto

+12 −0

Original line number	Diff line number	Diff line
		@@ -23,3 +23,15 @@ message EventStreamRequest {
		message BluetoothAddress {
		bytes address = 1;
		}

		enum BluetoothAddressTypeEnum {
		PUBLIC_DEVICE_ADDRESS = 0x0;
		RANDOM_DEVICE_ADDRESS = 0x1;
		PUBLIC_IDENTITY_ADDRESS = 0x2;
		RANDOM_IDENTITY_ADDRESS = 0x3;
		}

		enum BluetoothPeerAddressTypeEnum {
		PUBLIC_DEVICE_OR_IDENTITY_ADDRESS = 0x0;
		RANDOM_DEVICE_OR_IDENTITY_ADDRESS = 0x1;
		}