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

Commit a33f9bdc authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Gerrit Code Review
Browse files

Merge changes I9f0a18b8,I2d9036ca into main 

* changes:
  floss: btmanagerd: Increase log level for important settings
  floss: btmanagerd: Treat TurningOff as enabled states
parents 67fb9f15 e059e550

system/gd/rust/linux/mgmt/src/bluetooth_manager.rs

+4 −3
Original line number Diff line number Diff line 
use log::{error, info, warn};

use log::{error, warn};



use std::collections::HashMap;

use std::process::Command;
@@ -147,6 +147,7 @@ impl IBluetoothManager for BluetoothManager { 
    }



    fn set_floss_enabled(&mut self, enabled: bool) {

        warn!("Set Floss Enabeld={}", enabled);

        let prev = self.proxy.set_floss_enabled(enabled);

        config_util::write_floss_enabled(enabled);
@@ -209,6 +210,7 @@ impl IBluetoothManager for BluetoothManager { 
/// Implementation of IBluetoothExperimental

impl IBluetoothExperimental for BluetoothManager {

    fn set_ll_privacy(&mut self, enabled: bool) -> bool {

        warn!("Set Floss LL Privacy={}", enabled);

        let current_status = match config_util::read_floss_ll_privacy_enabled() {

            Ok(true) => true,

            _ => false,
@@ -218,7 +220,6 @@ impl IBluetoothExperimental for BluetoothManager { 
            return true;

        }



        info!("Set floss ll privacy to {}", enabled);

        if let Err(e) = config_util::write_floss_ll_privacy_enabled(enabled) {

            error!("Failed to write ll privacy status: {}", e);

            return false;
@@ -230,7 +231,7 @@ impl IBluetoothExperimental for BluetoothManager { 
    }



    fn set_devcoredump(&mut self, enabled: bool) -> bool {

        info!("Set floss devcoredump to {}", enabled);

        warn!("Set Floss DevCoreDump={}", enabled);

        config_util::write_coredump_state_to_file(enabled)

    }

}

system/gd/rust/linux/mgmt/src/state_machine.rs

+5 −5
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ pub enum ProcessState { 
/// Check whether adapter is enabled by checking internal state.

pub fn state_to_enabled(state: ProcessState) -> bool {

    match state {

        ProcessState::On => true,

        ProcessState::On | ProcessState::TurningOff => true,

        _ => false,

    }

}
@@ -726,13 +726,13 @@ pub async fn mainloop( 
                );



                // Only emit enabled event for certain transitions

                if next_state != prev_state

                    && (next_state == ProcessState::On || prev_state == ProcessState::On)

                {

                let prev_enabled = state_to_enabled(prev_state);

                let next_enabled = state_to_enabled(next_state);

                if prev_enabled != next_enabled {

                    bluetooth_manager

                        .lock()

                        .unwrap()

                        .callback_hci_enabled_change(hci, next_state == ProcessState::On);

                        .callback_hci_enabled_change(hci, next_enabled);

                }

            }