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

Commit 97c9e368 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang
Browse files

floss: Make sure scan mode is off when powered off 

This avoids a race when Floss is powered off and the system immediately
enters suspend.

Bug: 361510982
Tag: #floss
Test: mmm packages/modules/Bluetooth
Test: bluetooth_AdapterSRHealth.sr_while_powered_off.floss
Flag: EXEMPT, Floss-only changes
Change-Id: I6e1ac6a5778440b3a13a9e561bbe4b0df422084f
parent 955a57a6

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

+14 −0
Original line number Diff line number Diff line
@@ -612,6 +612,7 @@ pub struct Bluetooth { 
    freshness_check: Option<JoinHandle<()>>,

    sdp: Option<Sdp>,

    state: BtState,

    disabling: bool,

    tx: Sender<Message>,

    api_tx: Sender<APIMessage>,

    // Internal API members
@@ -669,6 +670,7 @@ impl Bluetooth { 
            freshness_check: None,

            sdp: None,

            state: BtState::Off,

            disabling: false,

            tx,

            api_tx,

            // Internal API members
@@ -702,6 +704,10 @@ impl Bluetooth { 
    }



    fn update_connectable_mode(&mut self, is_sock_listening: bool) {

        // Don't bother if we are disabling. See b/361510982

        if self.disabling {

            return;

        }

        // Set connectable if

        // - there is bredr socket listening, or

        // - there is a classic device bonded and not connected
@@ -2086,10 +2092,18 @@ impl IBluetooth for Bluetooth { 
    }



    fn enable(&mut self) -> bool {

        self.disabling = false;

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

    }



    fn disable(&mut self) -> bool {

        self.disabling = true;

        if !self.set_discoverable(BtDiscMode::NonDiscoverable, 0) {

            warn!("set_discoverable failed on disabling");

        }

        if !self.set_connectable_internal(false) {

            warn!("set_connectable_internal failed on disabling");

        }

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

    }