Merge changes Ief38ba9b,I55366cf1,Ieffd5724 into main am: a795c890f1 am: ae787cb121 (821f0a64) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/rust/linux/client/src/bt_gatt.rs

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ use bt_topshim::profiles::gatt::LePhy;
		#[derive(Debug, Copy, Clone)]
		pub enum AuthReq {
		// reference to system/stack/include/gatt_api.h
		NONE = 0,
		NoEnc = 0,
		EncNoMitm = 1,
		EncMitm = 2,
		SignedNoMitm = 3,
		@@ -38,7 +38,7 @@ impl GattClientContext {
		pub(crate) fn new() -> Self {
		GattClientContext {
		client_id: None,
		auth_req: AuthReq::NONE,
		auth_req: AuthReq::NoEnc,
		is_connect_direct: false,
		connect_transport: BtTransport::Le,
		connect_opportunistic: false,

system/gd/rust/linux/client/src/callbacks.rs

+22 −23

Original line number	Diff line number	Diff line
		@@ -176,15 +176,20 @@ impl IBluetoothCallback for BtCallback {
		}

		fn on_device_cleared(&mut self, remote_device: BluetoothDevice) {
		match self.context.lock().unwrap().found_devices.remove(&remote_device.address.to_string())
		if self
		.context
		.lock()
		.unwrap()
		.found_devices
		.remove(&remote_device.address.to_string())
		.is_some()
		{
		Some(_) => print_info!(
		print_info!(
		"Removed device: [{}: {:?}]",
		remote_device.address.to_string(),
		remote_device.name
		),
		None => (),
		};
		);
		}

		self.context.lock().unwrap().bonded_devices.remove(&remote_device.address.to_string());
		}
		@@ -217,8 +222,7 @@ impl IBluetoothCallback for BtCallback {
		// Auto-confirm bonding attempts that were locally initiated.
		// Ignore all other bonding attempts.
		let bonding_device = context.lock().unwrap().bonding_attempt.as_ref().cloned();
		match bonding_device {
		Some(bd) => {
		if let Some(bd) = bonding_device {
		if bd.address == rd.address {
		context
		.lock()
		@@ -229,8 +233,6 @@ impl IBluetoothCallback for BtCallback {
		.set_pairing_confirmation(rd.clone(), true);
		}
		}
		None => (),
		}
		}));
		}
		BtSspVariant::PasskeyEntry => {
		@@ -273,14 +275,11 @@ impl IBluetoothCallback for BtCallback {
		BtBondState::NotBonded \| BtBondState::Bonded => {
		let bonding_attempt =
		self.context.lock().unwrap().bonding_attempt.as_ref().cloned();
		match bonding_attempt {
		Some(bd) => {
		if let Some(bd) = bonding_attempt {
		if address == bd.address {
		self.context.lock().unwrap().bonding_attempt = None;
		}
		}
		None => (),
		}
		}
		BtBondState::Bonding => (),
		}

system/gd/rust/linux/client/src/command_handler.rs

+27 −27

Original line number	Diff line number	Diff line
		@@ -62,9 +62,9 @@ impl From<String> for CommandError {

		type CommandResult = Result<(), CommandError>;

		type CommandFunction = fn(&mut CommandHandler, &Vec<String>) -> CommandResult;
		type CommandFunction = fn(&mut CommandHandler, &[String]) -> CommandResult;

		fn _noop(_handler: &mut CommandHandler, _args: &Vec<String>) -> CommandResult {
		fn _noop(_handler: &mut CommandHandler, _args: &[String]) -> CommandResult {
		// Used so we can add options with no direct function
		// e.g. help and quit
		Ok(())
		@@ -406,7 +406,7 @@ fn build_commands() -> HashMap<String, CommandOption> {
		// Use this to safely index an argument and conveniently return the error if the argument does not
		// exist.
		fn get_arg<I>(
		args: &Vec<String>,
		args: &[String],
		index: I,
		) -> Result<&<I as SliceIndex<[String]>>::Output, CommandError>
		where
		@@ -422,7 +422,7 @@ impl CommandHandler {
		}

		/// Entry point for command and arguments
		pub fn process_cmd_line(&mut self, command: &str, args: &Vec<String>) -> bool {
		pub fn process_cmd_line(&mut self, command: &str, args: &[String]) -> bool {
		// Ignore empty line
		match command {
		"" => false,
		@@ -463,7 +463,7 @@ impl CommandHandler {
		.into()
		}

		fn cmd_help(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_help(&mut self, args: &[String]) -> CommandResult {
		if let Some(command) = args.first() {
		match self.command_options.get(command) {
		Some(cmd) => {
		@@ -477,7 +477,7 @@ impl CommandHandler {
		}
		None => {
		println!("'{}' is an invalid command!", command);
		self.cmd_help(&vec![]).ok();
		self.cmd_help(&[]).ok();
		}
		}
		} else {
		@@ -489,11 +489,11 @@ impl CommandHandler {

		// Header
		println!(
		"\n{}\n{}\n{}\n{}",
		"\n{}\n{}\n+{}+\n{}",
		equal_bar,
		wrap_help_text("Help Menu", MAX_MENU_CHAR_WIDTH, 2),
		// Minus bar
		format!("+{}+", BAR2_CHAR.repeat(MAX_MENU_CHAR_WIDTH)),
		BAR2_CHAR.repeat(MAX_MENU_CHAR_WIDTH),
		empty_bar
		);

		@@ -514,7 +514,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_adapter(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_adapter(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().manager_dbus.get_floss_enabled() {
		return Err("Floss is not enabled. First run, `floss enable`".into());
		}
		@@ -665,7 +665,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_get_address(&mut self, _args: &Vec<String>) -> CommandResult {
		fn cmd_get_address(&mut self, _args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -675,7 +675,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_discovery(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_discovery(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -695,7 +695,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_battery(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_battery(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -766,7 +766,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_bond(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_bond(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -825,7 +825,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_device(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_device(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -1055,7 +1055,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_floss(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_floss(&mut self, args: &[String]) -> CommandResult {
		let command = get_arg(args, 0)?;

		match &command[..] {
		@@ -1079,7 +1079,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_gatt(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_gatt(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -1220,7 +1220,7 @@ impl CommandHandler {
		}
		"set-auth-req" => {
		let flag = match &get_arg(args, 1)?[..] {
		"NONE" => AuthReq::NONE,
		"NONE" => AuthReq::NoEnc,
		"EncNoMitm" => AuthReq::EncNoMitm,
		"EncMitm" => AuthReq::EncMitm,
		"SignedNoMitm" => AuthReq::SignedNoMitm,
		@@ -1531,7 +1531,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_le_scan(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_le_scan(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -1598,7 +1598,7 @@ impl CommandHandler {

		// TODO(b/233128828): More options will be implemented to test BLE advertising.
		// Such as setting advertising parameters, starting multiple advertising sets, etc.
		fn cmd_advertise(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_advertise(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -1728,7 +1728,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_sdp(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_sdp(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -1753,7 +1753,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_socket(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_socket(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -1972,7 +1972,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_hid(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_hid(&mut self, args: &[String]) -> CommandResult {
		if !self.context.lock().unwrap().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -2035,7 +2035,7 @@ impl CommandHandler {
		self.command_options.values().flat_map(\|cmd\| cmd.rules.clone()).collect()
		}

		fn cmd_list_devices(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_list_devices(&mut self, args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -2073,7 +2073,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_telephony(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_telephony(&mut self, args: &[String]) -> CommandResult {
		if !self.context.lock().unwrap().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -2297,7 +2297,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_qa(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_qa(&mut self, args: &[String]) -> CommandResult {
		if !self.context.lock().unwrap().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -2324,7 +2324,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_media(&mut self, args: &Vec<String>) -> CommandResult {
		fn cmd_media(&mut self, args: &[String]) -> CommandResult {
		if !self.context.lock().unwrap().adapter_ready {
		return Err(self.adapter_not_ready());
		}
		@@ -2341,7 +2341,7 @@ impl CommandHandler {
		Ok(())
		}

		fn cmd_dumpsys(&mut self, _args: &Vec<String>) -> CommandResult {
		fn cmd_dumpsys(&mut self, _args: &[String]) -> CommandResult {
		if !self.lock_context().adapter_ready {
		return Err(self.adapter_not_ready());
		}

system/gd/rust/linux/client/src/dbus_iface.rs

+16 −8

Original line number	Diff line number	Diff line
		@@ -521,15 +521,12 @@ impl DBusArg for ScanFilterCondition {
		condition: ScanFilterCondition,
		) -> Result<dbus::arg::PropMap, Box<dyn std::error::Error>> {
		let mut map: dbus::arg::PropMap = std::collections::HashMap::new();
		match condition {
		ScanFilterCondition::Patterns(patterns) => {
		if let ScanFilterCondition::Patterns(patterns) = condition {
		map.insert(
		String::from("patterns"),
		dbus::arg::Variant(Box::new(DBusArg::to_dbus(patterns)?)),
		);
		}
		_ => {}
		}
		Ok(map)
		}

		@@ -716,6 +713,7 @@ impl_dbus_arg_enum!(BtDiscMode);

		// Implements RPC-friendly wrapper methods for calling IBluetooth, generated by
		// `generate_dbus_interface_client` below.
		#[derive(Clone)]
		pub(crate) struct BluetoothDBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -1114,6 +1112,7 @@ pub struct AdapterWithEnabledDbus {

		// Implements RPC-friendly wrapper methods for calling IBluetoothManager, generated by
		// `generate_dbus_interface_client` below.
		#[derive(Clone)]
		pub(crate) struct BluetoothManagerDBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -1329,6 +1328,7 @@ pub struct PeriodicAdvertisingParametersDBus {
		pub interval: i32,
		}

		#[derive(Clone)]
		pub(crate) struct BluetoothAdminDBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -1424,6 +1424,7 @@ impl IBluetoothAdminPolicyCallback for IBluetoothAdminPolicyCallbackDBus {
		}
		}

		#[derive(Clone)]
		pub(crate) struct BluetoothGattDBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -1517,6 +1518,7 @@ impl IBluetoothGatt for BluetoothGattDBus {
		}

		#[dbus_method("StartAdvertisingSet")]
		#[allow(clippy::too_many_arguments)]
		fn start_advertising_set(
		&mut self,
		parameters: AdvertisingSetParameters,
		@@ -1753,6 +1755,7 @@ impl IBluetoothGatt for BluetoothGattDBus {
		}

		#[dbus_method("ConnectionParameterUpdate")]
		#[allow(clippy::too_many_arguments)]
		fn connection_parameter_update(
		&self,
		client_id: i32,
		@@ -2098,6 +2101,7 @@ pub struct SocketResultDBus {
		id: u64,
		}

		#[derive(Clone)]
		pub(crate) struct BluetoothSocketManagerDBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -2361,6 +2365,7 @@ impl ISuspendCallback for ISuspendCallbackDBus {
		fn on_resumed(&mut self, suspend_id: i32) {}
		}

		#[derive(Clone)]
		pub(crate) struct BluetoothTelephonyDBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -2485,6 +2490,7 @@ impl IBluetoothTelephonyCallback for IBluetoothTelephonyCallbackDBus {
		}
		}

		#[derive(Clone)]
		pub(crate) struct BluetoothQADBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -2604,6 +2610,7 @@ impl IBluetoothQACallback for IBluetoothQACallbackDBus {
		}
		}

		#[derive(Clone)]
		pub(crate) struct BluetoothMediaDBusRPC {
		client_proxy: ClientDBusProxy,
		}
		@@ -2973,6 +2980,7 @@ impl IBluetoothMediaCallback for IBluetoothMediaCallbackDBus {
		fn on_lea_group_volume_changed(&mut self, group_id: i32, volume: u8) {}
		}

		#[derive(Clone)]
		pub(crate) struct BatteryManagerDBusRPC {
		client_proxy: ClientDBusProxy,
		}

system/gd/rust/linux/client/src/main.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -804,7 +804,7 @@ async fn handle_client_command(
		break 'foreground_actions;
		}

		handler.process_cmd_line(cmd, &rest.to_vec());
		handler.process_cmd_line(cmd, rest);
		break 'readline;
		}