Merge "Floss: Notify OnScannerRegistered when RegisterScanner fails" into main (f4b55ab8) · Commits · e / os / android_packages_modules_Bluetooth

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

+5 −6

Original line number	Diff line number	Diff line
		@@ -4095,12 +4095,6 @@ impl BtifGattScannerCallbacks for BluetoothGatt {
		status
		);

		if status != GattStatus::Success {
		log::error!("Error registering scanner UUID {}", uuid);
		self.scanners.lock().unwrap().remove(&uuid);
		return;
		}

		let mut scanners_lock = self.scanners.lock().unwrap();
		let scanner_info = scanners_lock.get_mut(&uuid);

		@@ -4117,6 +4111,11 @@ impl BtifGattScannerCallbacks for BluetoothGatt {
		uuid
		);
		}

		if status != GattStatus::Success {
		log::error!("Error registering scanner UUID {}", uuid);
		scanners_lock.remove(&uuid);
		}
		}

		fn on_scan_result(