Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ff348340 authored Jul 28, 2022 by Sonny Sasaka Committed by Automerger Merge Worker Jul 28, 2022

Merge "Floss: Fix swapped on_scanner_registered signature" am: 61f9511c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/2167520

Change-Id: If67b79a95abf9685712699fb3df30b720576b2e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 783aeeaf 61f9511c

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -323,7 +323,7 @@ impl ScannerCallback {
		}

		impl IScannerCallback for ScannerCallback {
		fn on_scanner_registered(&self, uuid: Uuid128Bit, status: u8, scanner_id: u8) {
		fn on_scanner_registered(&self, uuid: Uuid128Bit, scanner_id: u8, status: u8) {
		if status != 0 {
		print_error!("Failed registering scanner, status = {}", status);
		return;

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -230,7 +230,7 @@ impl RPCProxy for IScannerCallbackDBus {
		)]
		impl IScannerCallback for IScannerCallbackDBus {
		#[dbus_method("OnScannerRegistered")]
		fn on_scanner_registered(&self, uuid: Uuid128Bit, status: u8, scanner_id: u8) {}
		fn on_scanner_registered(&self, uuid: Uuid128Bit, scanner_id: u8, status: u8) {}
		}

		// Implements RPC-friendly wrapper methods for calling IBluetooth, generated by

system/gd/rust/linux/service/src/iface_bluetooth_gatt.rs

+1 −1

Original line number	Diff line number	Diff line
		@@ -142,7 +142,7 @@ struct ScannerCallbackDBus {}
		#[dbus_proxy_obj(ScannerCallback, "org.chromium.bluetooth.ScannerCallback")]
		impl IScannerCallback for ScannerCallbackDBus {
		#[dbus_method("OnScannerRegistered")]
		fn on_scanner_registered(&self, uuid: Uuid128Bit, status: u8, scanner_id: u8) {
		fn on_scanner_registered(&self, uuid: Uuid128Bit, scanner_id: u8, status: u8) {
		dbus_generated!()
		}
		}

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -420,7 +420,7 @@ pub trait IBluetoothGattCallback: RPCProxy {
		/// `IBluetoothGatt::register_scanner_callback`.
		pub trait IScannerCallback: RPCProxy {
		/// When the `register_scanner` request is done.
		fn on_scanner_registered(&self, uuid: Uuid128Bit, status: u8, scanner_id: u8);
		fn on_scanner_registered(&self, uuid: Uuid128Bit, scanner_id: u8, status: u8);
		}

		#[derive(Debug, FromPrimitive, ToPrimitive)]
		@@ -1485,7 +1485,7 @@ impl BtifGattScannerCallbacks for BluetoothGatt {
		info.scanner_id = Some(scanner_id);
		let callback = self.scanner_callbacks.get_by_id(info.callback_id);
		if let Some(cb) = callback {
		cb.on_scanner_registered(uuid.uu, status, scanner_id);
		cb.on_scanner_registered(uuid.uu, scanner_id, status);
		} else {
		log::warn!("There is no callback for scanner UUID {}", uuid);
		}