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

Commit 27edf930 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: Add callbacks for when name and discoverable change" am:... 

Merge "floss: Add callbacks for when name and discoverable change" am: bff9e091 am: 0c5031f5 am: ecd98bc6

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



Change-Id: I269172be0b6b9a675e38284b401b939614f16e04
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents beab6511 ecd98bc6

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

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ impl IBluetoothCallback for BtCallback { 
        self.context.lock().unwrap().adapter_address = Some(addr);

    }



    fn on_name_changed(&self, name: String) {

        print_info!("Name changed to {}", &name);

    }



    fn on_discoverable_changed(&self, discoverable: bool) {

        print_info!("Discoverable changed to {}", &discoverable);

    }



    fn on_device_found(&self, remote_device: BluetoothDevice) {

        self.context

            .lock()

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

+6 −0
Original line number Diff line number Diff line
@@ -174,6 +174,12 @@ impl IBluetoothCallback for IBluetoothCallbackDBus { 
    #[dbus_method("OnAddressChanged")]

    fn on_address_changed(&self, addr: String) {}



    #[dbus_method("OnNameChanged")]

    fn on_name_changed(&self, name: String) {}



    #[dbus_method("OnDiscoverableChanged")]

    fn on_discoverable_changed(&self, discoverable: bool) {}



    #[dbus_method("OnDeviceFound")]

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

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

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,14 @@ impl IBluetoothCallback for BluetoothCallbackDBus { 
    fn on_address_changed(&self, addr: String) {

        dbus_generated!()

    }

    #[dbus_method("OnNameChanged")]

    fn on_name_changed(&self, name: String) {

        dbus_generated!()

    }

    #[dbus_method("OnDiscoverableChanged")]

    fn on_discoverable_changed(&self, discoverable: bool) {

        dbus_generated!()

    }

    #[dbus_method("OnDeviceFound")]

    fn on_device_found(&self, remote_device: BluetoothDevice) {

        dbus_generated!()

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

+17 −0
Original line number Diff line number Diff line
@@ -234,6 +234,12 @@ pub trait IBluetoothCallback: RPCProxy { 
    /// When any of the adapter local address is changed.

    fn on_address_changed(&self, addr: String);



    /// When the adapter name is changed.

    fn on_name_changed(&self, name: String);



    /// When the adapter's discoverable mode is changed.

    fn on_discoverable_changed(&self, discoverable: bool);



    /// When a device is found via discovery.

    fn on_device_found(&self, remote_device: BluetoothDevice);
@@ -591,6 +597,17 @@ impl BtifBluetoothCallbacks for Bluetooth { 
                            ));

                    }

                }

                BluetoothProperty::BdName(bdname) => {

                    self.for_all_callbacks(|callback| {

                        callback.on_name_changed(bdname.clone());

                    });

                }

                BluetoothProperty::AdapterScanMode(mode) => {

                    self.for_all_callbacks(|callback| {

                        callback

                            .on_discoverable_changed(*mode == BtScanMode::ConnectableDiscoverable);

                    });

                }

                _ => {}

            }