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

Commit 731a8fec authored by Michael Sun's avatar Michael Sun Committed by Gerrit Code Review
Browse files

Merge "floss: Add on_device_connection_failed callback" into main

parents c1420252 0d60b024

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

+8 −0
Original line number Diff line number Diff line
@@ -377,6 +377,14 @@ impl IBluetoothConnectionCallback for BtConnectionCallback { 
            remote_device.name

        );

    }



    fn on_device_connection_failed(&mut self, remote_device: BluetoothDevice, status: BtStatus) {

        print_info!(

            "Connection to [{}] failed, status = {:?}",

            remote_device.address.to_string(),

            status

        );

    }

}



impl RPCProxy for BtConnectionCallback {

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

+3 −0
Original line number Diff line number Diff line
@@ -677,6 +677,9 @@ impl IBluetoothConnectionCallback for IBluetoothConnectionCallbackDBus { 


    #[dbus_method("OnDeviceDisconnected", DBusLog::Disable)]

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



    #[dbus_method("OnDeviceConnectionFailed", DBusLog::Disable)]

    fn on_device_connection_failed(&mut self, remote_device: BluetoothDevice, status: BtStatus) {}

}



#[allow(dead_code)]

system/gd/rust/linux/mgmt/Cargo.toml

+1 −1
Original line number Diff line number Diff line 
[package]

name = "manager_service"

version = "0.7.0"

version = "0.7.1"

edition = "2018"

build = "build.rs"

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

+8 −0
Original line number Diff line number Diff line
@@ -196,6 +196,14 @@ impl IBluetoothConnectionCallback for BluetoothConnectionCallbackDBus { 
    fn on_device_disconnected(&mut self, remote_device: BluetoothDevice) {

        dbus_generated!()

    }



    #[dbus_method(

        "OnDeviceConnectionFailed",

        DBusLog::Enable(DBusLogOptions::LogAll, DBusLogVerbosity::Verbose)

    )]

    fn on_device_connection_failed(&mut self, remote_device: BluetoothDevice, status: BtStatus) {

        dbus_generated!()

    }

}



impl_dbus_arg_enum!(BtSdpType);

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

+9 −0
Original line number Diff line number Diff line
@@ -574,6 +574,9 @@ pub trait IBluetoothConnectionCallback: RPCProxy { 


    /// Notification sent when a remote device completes HCI disconnection.

    fn on_device_disconnected(&mut self, remote_device: BluetoothDevice);



    /// Notification sent when a remote device fails to complete HCI connection.

    fn on_device_connection_failed(&mut self, remote_device: BluetoothDevice, status: BtStatus);

}



/// Implementation of the adapter API.
@@ -2061,6 +2064,12 @@ impl BtifBluetoothCallbacks for Bluetooth { 
                conn_direction,

                hci_reason,

            );

            self.connection_callbacks.for_all_callbacks(|callback| {

                callback.on_device_connection_failed(

                    BluetoothDevice::new(addr, String::from("")),

                    status,

                );

            });

            return;

        }