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

Commit 8b39696b authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "Floss: Add a stub for IBluetoothGatt::IsMsftSupported" am: 41c73ef7... 

Merge "Floss: Add a stub for IBluetoothGatt::IsMsftSupported" am: 41c73ef7 am: 32be6413 am: 56d033c5

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



Change-Id: If4352729294e078234cc730dbda19028e7f61d93
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0176ce28 56d033c5

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

+5 −0
Original line number Diff line number Diff line
@@ -861,6 +861,11 @@ impl BluetoothGattDBus { 
impl IBluetoothGatt for BluetoothGattDBus {

    // Scanning



    #[dbus_method("IsMsftSupported")]

    fn is_msft_supported(&self) -> bool {

        dbus_generated!()

    }



    #[dbus_method("RegisterScannerCallback")]

    fn register_scanner_callback(&mut self, _callback: Box<dyn IScannerCallback + Send>) -> u32 {

        dbus_generated!()

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

+5 −0
Original line number Diff line number Diff line
@@ -438,6 +438,11 @@ struct IBluetoothGattDBus {} 
impl IBluetoothGatt for IBluetoothGattDBus {

    // Scanning



    #[dbus_method("IsMsftSupported")]

    fn is_msft_supported(&self) -> bool {

        dbus_generated!()

    }



    #[dbus_method("RegisterScannerCallback")]

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

        dbus_generated!()

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

+9 −0
Original line number Diff line number Diff line
@@ -182,6 +182,10 @@ impl ContextMap { 
pub trait IBluetoothGatt {

    // Scanning



    /// Returns whether LE Scan can be performed by hardware offload defined by

    /// [MSFT HCI Extension](https://learn.microsoft.com/en-us/windows-hardware/drivers/bluetooth/microsoft-defined-bluetooth-hci-commands-and-events).

    fn is_msft_supported(&self) -> bool;



    /// Registers an LE scanner callback.

    ///

    /// Returns the callback id.
@@ -936,6 +940,11 @@ struct ScannerInfo { 
}



impl IBluetoothGatt for BluetoothGatt {

    fn is_msft_supported(&self) -> bool {

        // TODO(b/244505567): Wire the real capability from lower layer.

        false

    }



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

        self.scanner_callbacks.add_callback(callback)

    }