Merge "Floss: Fix argument length checking in btclient" (893178e9) · Commits · e / os / android_packages_modules_Bluetooth

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

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -586,7 +586,7 @@ impl CommandHandler {
	);		);
	}		}
	"set-alias" => {		"set-alias" => {
	if args.len() < 3 {		if args.len() < 4 {
	println!("usage: device set-alias <address> <new-alias>");		println!("usage: device set-alias <address> <new-alias>");
	return;		return;
	}		}
	@@ -660,7 +660,7 @@ impl CommandHandler {
	);		);
	}		}
	"client-connect" => {		"client-connect" => {
	if args.len() < 2 {		if args.len() < 3 {
	println!("usage: gatt client-connect <addr>");		println!("usage: gatt client-connect <addr>");
	return;		return;
	}		}
	@@ -703,7 +703,7 @@ impl CommandHandler {
	.client_disconnect(client_id.unwrap(), addr);		.client_disconnect(client_id.unwrap(), addr);
	}		}
	"client-read-phy" => {		"client-read-phy" => {
	if args.len() < 2 {		if args.len() < 3 {
	println!("usage: gatt client-read-phy <addr>");		println!("usage: gatt client-read-phy <addr>");
	return;		return;
	}		}
	@@ -724,7 +724,7 @@ impl CommandHandler {
	.client_read_phy(client_id.unwrap(), addr);		.client_read_phy(client_id.unwrap(), addr);
	}		}
	"client-discover-services" => {		"client-discover-services" => {
	if args.len() < 2 {		if args.len() < 3 {
	println!("usage: gatt client-discover-services <addr>");		println!("usage: gatt client-discover-services <addr>");
	return;		return;
	}		}
	@@ -798,7 +798,7 @@ impl CommandHandler {
	}		}
	}		}
	"unregister-scanner" => {		"unregister-scanner" => {
	if args.len() < 2 {		if args.len() < 3 {
	println!("usage: le-scan unregister-scanner <scanner-id>");		println!("usage: le-scan unregister-scanner <scanner-id>");
	return;		return;
	}		}