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

Commit 61f9511c authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Gerrit Code Review
Browse files

Merge "Floss: Fix swapped on_scanner_registered signature"

parents 9d5123bf 36432ff2

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);

            }