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

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

Merge "Floss: filter unexpected cancel discovery from UI" am: ea4b7a08 am:... 

Merge "Floss: filter unexpected cancel discovery from UI" am: ea4b7a08 am: 54709fa0 am: 2e82ec9f am: c333a8b9

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



Change-Id: If7ae453fdc9d21589ceacc81d766e5273574968d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b6ed061 c333a8b9

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

+7 −0
Original line number Original line Diff line number Diff line
@@ -1081,6 +1081,13 @@ impl IBluetooth for Bluetooth { 
    }

    }





    fn cancel_discovery(&self) -> bool {

    fn cancel_discovery(&self) -> bool {

        // Reject the cancel discovery request if the underlying stack is not in a discovering

        // state. For example, previous start discovery was enqueued for ongoing discovery.

        if !self.is_discovering {

            debug!("Reject cancel_discovery as it's not in discovering state.");

            return false;

        }



        self.intf.lock().unwrap().cancel_discovery() == 0

        self.intf.lock().unwrap().cancel_discovery() == 0

    }

    }