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

Commit 8479f979 authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Gerrit Code Review
Browse files

Merge changes Ic43aa45c,Ie3788e93 

* changes:
  Floss: Wire OnTrackAdvFoundLost event
  Floss: Define on_scan_result_lost API
parents bf15bee5 cc6a675a

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

+6 −0
Original line number Diff line number Diff line
@@ -327,6 +327,12 @@ impl IScannerCallback for ScannerCallback { 
        }

    }



    fn on_scan_result_lost(&self, scan_result: ScanResult) {

        if self.context.lock().unwrap().active_scanner_ids.len() > 0 {

            print_info!("Scan result lost: {:#?}", scan_result);

        }

    }



    fn on_suspend_mode_change(&self, _suspend_mode: SuspendMode) {

        // No-op, not interesting for btclient.

    }

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

+5 −0
Original line number Diff line number Diff line
@@ -336,6 +336,11 @@ impl IScannerCallback for IScannerCallbackDBus { 
        dbus_generated!()

    }



    #[dbus_method("OnScanResultLost")]

    fn on_scan_result_lost(&self, scan_result: ScanResult) {

        dbus_generated!()

    }



    #[dbus_method("OnSuspendModeChange")]

    fn on_suspend_mode_change(&self, suspend_mode: SuspendMode) {

        dbus_generated!()

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

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,11 @@ impl IScannerCallback for ScannerCallbackDBus { 
        dbus_generated!()

    }



    #[dbus_method("OnScanResultLost")]

    fn on_scan_result_lost(&self, scan_result: ScanResult) {

        dbus_generated!()

    }



    #[dbus_method("OnSuspendModeChange")]

    fn on_suspend_mode_change(&self, suspend_mode: SuspendMode) {

        dbus_generated!()

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

+38 −4
Original line number Diff line number Diff line
@@ -5,10 +5,10 @@ use btif_macros::{btif_callback, btif_callbacks_dispatcher}; 
use bt_topshim::bindings::root::bluetooth::Uuid;

use bt_topshim::btif::{BluetoothInterface, BtStatus, BtTransport, RawAddress, Uuid128Bit};

use bt_topshim::profiles::gatt::{

    AdvertisingStatus, BtGattDbElement, BtGattNotifyParams, BtGattReadParams, Gatt,

    GattAdvCallbacks, GattAdvCallbacksDispatcher, GattAdvInbandCallbacksDispatcher,

    GattClientCallbacks, GattClientCallbacksDispatcher, GattScannerCallbacks,

    GattScannerCallbacksDispatcher, GattScannerInbandCallbacks,

    ffi::RustAdvertisingTrackInfo, AdvertisingStatus, BtGattDbElement, BtGattNotifyParams,

    BtGattReadParams, Gatt, GattAdvCallbacks, GattAdvCallbacksDispatcher,

    GattAdvInbandCallbacksDispatcher, GattClientCallbacks, GattClientCallbacksDispatcher,

    GattScannerCallbacks, GattScannerCallbacksDispatcher, GattScannerInbandCallbacks,

    GattScannerInbandCallbacksDispatcher, GattServerCallbacksDispatcher, GattStatus, LePhy,

    MsftAdvMonitor, MsftAdvMonitorPattern,

};
@@ -591,6 +591,10 @@ pub trait IScannerCallback: RPCProxy { 
    /// requested to be filtered in.

    fn on_scan_result(&self, scan_result: ScanResult);



    /// When an LE advertisement matching aggregate filters is no longer detected. The criteria of

    /// how a device is considered lost is specified by ScanFilter.

    fn on_scan_result_lost(&self, scan_result: ScanResult);



    /// When LE Scan module changes suspend mode due to system suspend/resume.

    fn on_suspend_mode_change(&self, suspend_mode: SuspendMode);

}
@@ -2445,6 +2449,9 @@ pub(crate) trait BtifGattScannerCallbacks { 
        periodic_adv_int: u16,

        adv_data: Vec<u8>,

    );



    #[btif_callback(OnTrackAdvFoundLost)]

    fn on_track_adv_found_lost(&mut self, adv_track_info: RustAdvertisingTrackInfo);

}



#[btif_callbacks_dispatcher(dispatch_le_scanner_inband_callbacks, GattScannerInbandCallbacks)]
@@ -2723,6 +2730,33 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 
            });

        });

    }



    fn on_track_adv_found_lost(&mut self, track_adv_info: RustAdvertisingTrackInfo) {

        self.scanner_callbacks.for_all_callbacks(|callback| {

            let adv_data =

                [&track_adv_info.adv_packet[..], &track_adv_info.scan_response[..]].concat();



            callback.on_scan_result_lost(ScanResult {

                name: adv_parser::extract_name(adv_data.as_slice()),

                address: track_adv_info.advertiser_address.to_string(),

                addr_type: track_adv_info.advertiser_address_type,

                event_type: 0, /* not used */

                primary_phy: LePhy::Phy1m as u8,

                secondary_phy: 0,      /* not used */

                advertising_sid: 0xff, /* not present */

                /* A bug in libbluetooth that uses u8 for TX power.

                 * TODO(b/261482382): Fix the data type in C++ layer to use i8 instead of u8. */

                tx_power: track_adv_info.tx_power as i8,

                rssi: track_adv_info.rssi,

                periodic_adv_int: 0, /* not used */

                flags: adv_parser::extract_flags(adv_data.as_slice()),

                service_uuids: adv_parser::extract_service_uuids(adv_data.as_slice()),

                service_data: adv_parser::extract_service_data(adv_data.as_slice()),

                manufacturer_data: adv_parser::extract_manufacturer_data(adv_data.as_slice()),

                adv_data,

            });

        });

    }

}



#[btif_callbacks_dispatcher(dispatch_le_adv_callbacks, GattAdvCallbacks)]