Merge "Floss: Clean up warnings" (bfb56805) · Commits · e / os / android_packages_modules_Bluetooth

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -998,7 +998,7 @@ impl BtSocketManagerCallback {

		tokio::spawn(async move {
		for i in 0..num_frame {
		fd.write_all(SOCKET_TEST_WRITE);
		fd.write_all(SOCKET_TEST_WRITE).ok();
		print_info!("data sent: {}", i + 1);
		tokio::time::sleep(send_interval).await;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -1184,7 +1184,7 @@ impl BtifBluetoothCallbacks for Bluetooth {
		link_type: BtTransport,
		hci_reason: BtHciErrorCode,
		conn_direction: BtConnectionDirection,
		acl_handle: u16,
		_acl_handle: u16,
		) {
		if status != BtStatus::Success {
		warn!(

+4 −4

Original line number	Diff line number	Diff line
		@@ -343,10 +343,10 @@ impl ServerContextMap {
		}

		fn add_request(&mut self, request_id: i32, handle: i32) {
		self.requests.push(Request { id: request_id, handle: handle });
		self.requests.push(Request { id: request_id, handle });
		}

		fn delete_request(&mut self, request_id: i32) {
		fn _delete_request(&mut self, request_id: i32) {
		self.requests.retain(\|request\| request.id != request_id);
		}

		@@ -2503,7 +2503,7 @@ impl IBluetoothGatt for BluetoothGatt {
		value: data,
		handle: handle as u16,
		offset: offset as u16,
		len: len,
		len,
		auth_req: 0 as u8,
		},
		},
		@@ -2540,7 +2540,7 @@ impl IBluetoothGatt for BluetoothGatt {

		fn server_set_preferred_phy(
		&self,
		server_id: i32,
		_server_id: i32,
		addr: String,
		tx_phy: LePhy,
		rx_phy: LePhy,

+1 −1

Original line number	Diff line number	Diff line
		@@ -820,7 +820,7 @@ impl BluetoothSocketManager {
		}

		Err(e) => {
		if e == nix::Error::Sys(nix::errno::Errno::EAGAIN) {
		if e == nix::errno::Errno::EAGAIN {
		Err(std::io::Error::new(
		std::io::ErrorKind::WouldBlock,
		"Recvfrom is readable but would block on read",