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

Commit 0e8e6cda authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "floss: Fix typo in D-Bus method" am: 7ec0cb04 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1872668

Change-Id: I05406e08dcfc709bb8b8c0ca07630a121db869c3
parents 5a0b3e3e 7ec0cb04

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

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ impl IBluetoothConnectionCallback for IBluetoothConnectionCallbackDBus { 
    #[dbus_method("OnDeviceConnected")]

    fn on_device_connected(&self, remote_device: BluetoothDevice) {}



    #[dbus_method("OnDeviceDisconencted")]

    #[dbus_method("OnDeviceDisconnected")]

    fn on_device_disconnected(&self, remote_device: BluetoothDevice) {}

}

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ impl IBluetoothConnectionCallback for BluetoothConnectionCallbackDBus { 
    #[dbus_method("OnDeviceConnected")]

    fn on_device_connected(&self, remote_device: BluetoothDevice) {}



    #[dbus_method("OnDeviceDisconencted")]

    #[dbus_method("OnDeviceDisconnected")]

    fn on_device_disconnected(&self, remote_device: BluetoothDevice) {}

}

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

+0 −1
Original line number Diff line number Diff line
@@ -886,7 +886,6 @@ impl IBluetooth for Bluetooth { 
            == 0

    }



    /// Set passkey on bonding device.

    fn set_passkey(

        &self,

        device: BluetoothDevice,