Commit adbfebfd authored May 12, 2022 by Ying Hsu Committed by Ying Hsu May 12, 2022

Floss: filter unexpected cancel discovery from UI

Cancel discovery requests from UI could interrupt the service discovery
process with classic devices. As libbluetooth enqueues start discovery
request when there's ongoing device or service discovery, we use the
discovery state reported by libbluetooth to filter unwanted cancel
discovery requests.

Bug: 232058607
Tag: #floss
Test: pair classic/BLE keyboard and mouse from ChromeOS UI
Change-Id: I345b362ce953f83db6336336b5c26e0d2ae1fd1a

parent 644867c6

system/gd/rust/linux/stack/src/bluetooth.rs

+7 −0

Original line number	Diff line number	Diff line
		@@ -1081,6 +1081,13 @@ impl IBluetooth for Bluetooth {
		}

		fn cancel_discovery(&self) -> bool {
		// Reject the cancel discovery request if the underlying stack is not in a discovering
		// state. For example, previous start discovery was enqueued for ongoing discovery.
		if !self.is_discovering {
		debug!("Reject cancel_discovery as it's not in discovering state.");
		return false;
		}

		self.intf.lock().unwrap().cancel_discovery() == 0
		}