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

Commit 90bb9a0b authored by Katherine Lai's avatar Katherine Lai Committed by Gerrit Code Review
Browse files

Merge changes I6c852f5b,Ibeef79e5 

* changes:
  Floss: Audit callbacks.
  [Floss] Add and fix btstack unit tests
parents 381bfa01 18940776

Cargo.toml

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ default-members = [ 
  "system/gd/rust/topshim",

  "system/gd/rust/linux/mgmt",

  "system/gd/rust/linux/service",

  "system/gd/rust/linux/stack",

  "system/gd/rust/linux/client",

]
@@ -28,6 +29,7 @@ members = [ 
  "system/gd/rust/topshim",

  "system/gd/rust/linux/mgmt",

  "system/gd/rust/linux/service",

  "system/gd/rust/linux/stack",

  "system/gd/rust/linux/client",

  "floss/hcidoc",

]

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

+12 −2
Original line number Diff line number Diff line
@@ -701,7 +701,12 @@ impl BluetoothDBus { 
#[generate_dbus_interface_client(BluetoothDBusRPC)]

impl IBluetooth for BluetoothDBus {

    #[dbus_method("RegisterCallback")]

    fn register_callback(&mut self, callback: Box<dyn IBluetoothCallback + Send>) {

    fn register_callback(&mut self, callback: Box<dyn IBluetoothCallback + Send>) -> u32 {

        dbus_generated!()

    }



    #[dbus_method("UnregisterCallback")]

    fn unregister_callback(&mut self, id: u32) -> bool {

        dbus_generated!()

    }
@@ -1407,7 +1412,7 @@ impl IBluetoothGatt for BluetoothGattDBus { 
    }



    #[dbus_method("UnregisterAdvertiserCallback")]

    fn unregister_advertiser_callback(&mut self, callback_id: u32) {

    fn unregister_advertiser_callback(&mut self, callback_id: u32) -> bool {

        dbus_generated!()

    }
@@ -2012,6 +2017,11 @@ impl IBluetoothSocketManager for BluetoothSocketManagerDBus { 
        dbus_generated!()

    }



    #[dbus_method("UnregisterCallback")]

    fn unregister_callback(&mut self, callback: CallbackId) -> bool {

        dbus_generated!()

    }



    #[dbus_method("ListenUsingInsecureL2capChannel")]

    fn listen_using_insecure_l2cap_channel(&mut self, callback: CallbackId) -> SocketResult {

        dbus_generated!()

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

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ impl IBatteryManager for IBatteryManagerDBus { 
    }



    #[dbus_method("UnregisterBatteryCallback")]

    fn unregister_battery_callback(&mut self, callback_id: u32) {

    fn unregister_battery_callback(&mut self, callback_id: u32) -> bool {

        dbus_generated!()

    }

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

+11 −1
Original line number Diff line number Diff line
@@ -418,7 +418,12 @@ struct IBluetoothDBus {} 
)]

impl IBluetooth for IBluetoothDBus {

    #[dbus_method("RegisterCallback")]

    fn register_callback(&mut self, callback: Box<dyn IBluetoothCallback + Send>) {

    fn register_callback(&mut self, callback: Box<dyn IBluetoothCallback + Send>) -> u32 {

        dbus_generated!()

    }



    #[dbus_method("UnregisterCallback")]

    fn unregister_callback(&mut self, id: u32) -> bool {

        dbus_generated!()

    }
@@ -750,6 +755,11 @@ impl IBluetoothSocketManager for IBluetoothSocketManagerDBus { 
        dbus_generated!()

    }



    #[dbus_method("UnregisterCallback")]

    fn unregister_callback(&mut self, callback: CallbackId) -> bool {

        dbus_generated!()

    }



    #[dbus_method("ListenUsingInsecureL2capChannel")]

    fn listen_using_insecure_l2cap_channel(&mut self, callback: CallbackId) -> SocketResult {

        dbus_generated!()

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

+1 −1
Original line number Diff line number Diff line
@@ -655,7 +655,7 @@ impl IBluetoothGatt for IBluetoothGattDBus { 
    }



    #[dbus_method("UnregisterAdvertiserCallback")]

    fn unregister_advertiser_callback(&mut self, callback_id: u32) {

    fn unregister_advertiser_callback(&mut self, callback_id: u32) -> bool {

        dbus_generated!()

    }