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

Commit 4035363e authored by Hsin-chen Chuang's avatar Hsin-chen Chuang
Browse files

floss: Don't bookmark connectable mode if set mode failed 

Set mode may fail in some cases such as the LibBluetooth stack is not
yet ready. In any case we just shouldn't save the new mode on failure.

Bug: 336881286
Tag: #floss
Test: mmm packages/modules/Bluetooth
Test: Stress run bluetooth_AdapterSRHealth.sr_while_powered_off.floss
Flag: EXEMPT, Floss-only changes
Change-Id: Ibb73f15cdb10cb8267fa28a444a205a589cd1544
parent ae4c4168

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

+14 −17
Original line number Diff line number Diff line
@@ -870,15 +870,23 @@ impl Bluetooth { 
        if self.is_connectable == mode {

            return true;

        }

        self.is_connectable = mode;

        if self.discoverable_mode != BtDiscMode::NonDiscoverable {

            // Discoverable always implies connectable. Don't affect the discoverable mode for now

            // and the connectable mode would be restored when discoverable becomes off.

            self.is_connectable = mode;

            return true;

        }

        let status =

            self.intf.lock().unwrap().set_adapter_property(BluetoothProperty::AdapterScanMode(

                if mode { BtScanMode::Connectable } else { BtScanMode::None_ },

        )) == 0

            ));

        let status = BtStatus::from(status as u32);

        if status != BtStatus::Success {

            warn!("Failed to set connectable mode: {:?}", status);

            return false;

        }

        self.is_connectable = mode;

        return true;

    }



    /// Returns adapter's discoverable mode.
@@ -1335,13 +1343,7 @@ pub(crate) trait BtifBluetoothCallbacks { 
    fn discovery_state(&mut self, state: BtDiscoveryState) {}



    #[btif_callback(SspRequest)]

    fn ssp_request(

        &mut self,

        remote_addr: RawAddress,

        variant: BtSspVariant,

        passkey: u32,

    ) {

    }

    fn ssp_request(&mut self, remote_addr: RawAddress, variant: BtSspVariant, passkey: u32) {}



    #[btif_callback(BondState)]

    fn bond_state(
@@ -1701,12 +1703,7 @@ impl BtifBluetoothCallbacks for Bluetooth { 
        }

    }



    fn ssp_request(

        &mut self,

        remote_addr: RawAddress,

        variant: BtSspVariant,

        passkey: u32,

    ) {

    fn ssp_request(&mut self, remote_addr: RawAddress, variant: BtSspVariant, passkey: u32) {

        // Accept the Just-Works pairing that we initiated, reject otherwise.

        if variant == BtSspVariant::Consent {

            let initiated_by_us = Some(remote_addr.clone()) == self.active_pairing_address;