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

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

Merge "floss: Abort freshness_check JoinHandle before dropping." am: 2fe318ba am: 8925b51d 

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



Change-Id: I1f41d2c40d25ad57155f84da992a4a937800b7d3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ac1769f9 8925b51d

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

+5 −2
Original line number Diff line number Diff line
@@ -481,8 +481,11 @@ impl Bluetooth { 
    /// Check whether found devices are still fresh. If they're outside the

    /// freshness window, send a notification to clear the device from clients.

    pub(crate) fn trigger_freshness_check(&mut self) {

        // Drop previous joinhandle

        if let Some(ref handle) = self.freshness_check {

            // Abort and drop the previous JoinHandle.

            handle.abort();

            self.freshness_check = None;

        }



        // A found device is considered fresh if:

        // * It was last seen less than |FOUND_DEVICE_FRESHNESS| ago.