Snap for 5838830 from 4cce3f5af04dd2df640563fef85e304b62a83c02 to rvc-release (7ffaf56d) · Commits · e / os / android_packages_modules_Bluetooth

system/binder/android/bluetooth/IBluetoothPan.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ import android.bluetooth.BluetoothDevice;
		interface IBluetoothPan {
		// Public API
		boolean isTetheringOn();
		void setBluetoothTethering(boolean value);
		void setBluetoothTethering(boolean value, String pkgName);
		boolean connect(in BluetoothDevice device);
		boolean disconnect(in BluetoothDevice device);
		List<BluetoothDevice> getConnectedDevices();

system/gd/cert/android_devices_config.json

+0 −4

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@
		{
		"grpc_port": "8899",
		"grpc_root_server_port": "8897",
		"signal_port": "8895",
		"label": "stack_under_test",
		"serial_number": "DUT",
		"cmd":
		@@ -21,7 +20,6 @@
		"/system/bin/stack_with_facade",
		"--grpc-port=$(grpc_port)",
		"--root-server-port=$(grpc_root_server_port)",
		"--signal-port=$(signal_port)"
		]
		}
		],
		@@ -30,7 +28,6 @@
		{
		"grpc_port": "8898",
		"grpc_root_server_port": "8896",
		"signal_port": "8894",
		"label": "cert_stack",
		"serial_number": "CERT",
		"cmd":
		@@ -42,7 +39,6 @@
		"/system/bin/bluetooth_cert_stack",
		"--grpc-port=$(grpc_port)",
		"--root-server-port=$(grpc_root_server_port)",
		"--signal-port=$(signal_port)"
		]
		}
		]

system/gd/cert/cert_main.cc

+0 −17

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		#include "stack_manager.h"

		#include <netinet/in.h>
		#include <sys/socket.h>
		#include <sys/types.h>
		#include <unistd.h>
		#include <csignal>
		#include <cstring>
		@@ -49,12 +46,10 @@ void interrupt_handler(int) {
		int main(int argc, const char** argv) {
		int root_server_port = 8896;
		int grpc_port = 8898;
		int signal_port = 8894;

		const std::string arg_grpc_root_server_port = "--root-server-port=";
		const std::string arg_grpc_server_port = "--grpc-port=";
		const std::string arg_rootcanal_port = "--rootcanal-port=";
		const std::string arg_signal_port = "--signal-port=";
		const std::string arg_btsnoop_path = "--btsnoop=";
		std::string btsnoop_path;
		for (int i = 1; i < argc; i++) {
		@@ -75,22 +70,10 @@ int main(int argc, const char** argv) {
		btsnoop_path = arg.substr(arg_btsnoop_path.size());
		::bluetooth::hal::SnoopLogger::SetFilePath(btsnoop_path);
		}
		if (arg.find(arg_signal_port) == 0) {
		auto port_number = arg.substr(arg_signal_port.size());
		signal_port = std::stoi(port_number);
		}
		}

		signal(SIGINT, interrupt_handler);
		grpc_root_server.StartServer("0.0.0.0", root_server_port, grpc_port);
		int tester_signal_socket = socket(AF_INET, SOCK_STREAM, 0);
		struct sockaddr_in addr;
		memset(&addr, 0, sizeof(addr));
		addr.sin_family = AF_INET;
		addr.sin_port = htons(signal_port);
		addr.sin_addr.s_addr = htonl(INADDR_ANY);
		connect(tester_signal_socket, (sockaddr*)&addr, sizeof(addr));
		close(tester_signal_socket);
		auto wait_thread = std::thread([] { grpc_root_server.RunGrpcLoop(); });
		wait_thread.join();

system/gd/cert/gd_cert_device.py

+2 −3

Original line number	Diff line number	Diff line
		@@ -55,13 +55,12 @@ def get_instances_with_configs(configs):
		resolved_cmd.append(replace_vars(entry, config))
		devices.append(GdCertDevice(config["grpc_port"],
		config["grpc_root_server_port"],
		config["signal_port"],
		resolved_cmd, config["label"]))
		return devices

		class GdCertDevice(GdDeviceBase):
		def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd, label):
		super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd,
		def __init__(self, grpc_port, grpc_root_server_port, cmd, label):
		super().__init__(grpc_port, grpc_root_server_port, cmd,
		label, ACTS_CONTROLLER_CONFIG_NAME)

		# Cert stubs

system/gd/cert/gd_device.py

+2 −3

Original line number	Diff line number	Diff line
		@@ -55,13 +55,12 @@ def get_instances_with_configs(configs):
		resolved_cmd.append(replace_vars(entry, config))
		devices.append(GdDevice(config["grpc_port"],
		config["grpc_root_server_port"],
		config["signal_port"],
		resolved_cmd, config["label"]))
		return devices

		class GdDevice(GdDeviceBase):
		def __init__(self, grpc_port, grpc_root_server_port, signal_port, cmd, label):
		super().__init__(grpc_port, grpc_root_server_port, signal_port, cmd,
		def __init__(self, grpc_port, grpc_root_server_port, cmd, label):
		super().__init__(grpc_port, grpc_root_server_port, cmd,
		label, ACTS_CONTROLLER_CONFIG_NAME)

		# Facade stubs