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

Commit 684ba2df authored by Sonny Sasaka's avatar Sonny Sasaka
Browse files

Floss: Rename on_scan_result_lost to on_advertisement_lost 

For better symmetry with on_advertisement_found, this renames
on_scan_result_lost to on_advertisement_lost.

Bug: 269343922
Tag: #floss
Test: Build Floss on Linux/Chrome OS

Change-Id: I9aa8eb35137d5662d41527541fc230a7d1c32958
parent d7e28911

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

+2 −2
Original line number Diff line number Diff line
@@ -339,9 +339,9 @@ impl IScannerCallback for ScannerCallback { 
        }

    }



    fn on_scan_result_lost(&self, scan_result: ScanResult) {

    fn on_advertisement_lost(&self, scan_result: ScanResult) {

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

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

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

        }

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -344,8 +344,8 @@ impl IScannerCallback for IScannerCallbackDBus { 
        dbus_generated!()

    }



    #[dbus_method("OnScanResultLost")]

    fn on_scan_result_lost(&self, scan_result: ScanResult) {

    #[dbus_method("OnAdvertisementLost")]

    fn on_advertisement_lost(&self, scan_result: ScanResult) {

        dbus_generated!()

    }

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

+2 −2
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ impl IScannerCallback for ScannerCallbackDBus { 
        dbus_generated!()

    }



    #[dbus_method("OnScanResultLost")]

    fn on_scan_result_lost(&self, scan_result: ScanResult) {

    #[dbus_method("OnAdvertisementLost")]

    fn on_advertisement_lost(&self, scan_result: ScanResult) {

        dbus_generated!()

    }

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

+3 −3
Original line number Diff line number Diff line
@@ -1062,7 +1062,7 @@ pub trait IScannerCallback: RPCProxy { 
    /// When an LE advertisement matching aggregate filters is detected. This callback is shared

    /// among all scanner callbacks and is triggered for *every* advertisement that the controller

    /// receives. For listening to the beginning and end of a specific scanner's advertisements

    /// detected while in RSSI range, use on_advertisement_found and on_scan_result_lost below.

    /// detected while in RSSI range, use on_advertisement_found and on_advertisement_lost below.

    fn on_scan_result(&self, scan_result: ScanResult);



    /// When an LE advertisement matching aggregate filters is found. The criteria of
@@ -1073,7 +1073,7 @@ pub trait IScannerCallback: RPCProxy { 
    /// how a device is considered lost is specified by ScanFilter.

    // TODO(b/269343922): Rename this to on_advertisement_lost for symmetry with

    // on_advertisement_found.

    fn on_scan_result_lost(&self, scan_result: ScanResult);

    fn on_advertisement_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);
@@ -3912,7 +3912,7 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 
            if track_adv_info.advertiser_state == 0x01 {

                callback.on_advertisement_found(scan_result);

            } else {

                callback.on_scan_result_lost(scan_result);

                callback.on_advertisement_lost(scan_result);

            }

        });

    }