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

Commit 22b05a5e authored by Hansong Zhang's avatar Hansong Zhang
Browse files

Floss: Initialize media after stack enabled 

AVRCP depends on main message loop.  We need to synchronize the startup
sequence.

Test: run btadapterd
Tag: #floss
Bug: 195398850
Change-Id: Ibdaf0bbd7dedd54504d752e42a67f800cc2114f6
parent c35b30a0

system/gd/rust/linux/service/src/main.rs

+7 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ use futures::future; 
use btstack::bluetooth::get_bt_dispatcher;

use btstack::bluetooth::{Bluetooth, IBluetooth};

use btstack::bluetooth_gatt::BluetoothGatt;

use btstack::bluetooth_media::{BluetoothMedia, IBluetoothMedia};

use btstack::bluetooth_media::BluetoothMedia;

use btstack::Stack;



use std::error::Error;
@@ -52,10 +52,14 @@ fn main() -> Result<(), Box<dyn Error>> { 
    let (tx, rx) = Stack::create_channel();



    let intf = Arc::new(Mutex::new(get_btinterface().unwrap()));

    let bluetooth = Arc::new(Mutex::new(Box::new(Bluetooth::new(tx.clone(), intf.clone()))));

    let bluetooth_gatt = Arc::new(Mutex::new(Box::new(BluetoothGatt::new(intf.clone()))));

    let bluetooth_media =

        Arc::new(Mutex::new(Box::new(BluetoothMedia::new(tx.clone(), intf.clone()))));

    let bluetooth = Arc::new(Mutex::new(Box::new(Bluetooth::new(

        tx.clone(),

        intf.clone(),

        bluetooth_media.clone(),

    ))));



    // Args don't include arg[0] which is the binary name

    let all_args = std::env::args().collect::<Vec<String>>();
@@ -72,7 +76,6 @@ fn main() -> Result<(), Box<dyn Error>> { 
        bluetooth.enable();



        bluetooth_gatt.lock().unwrap().init_profiles(tx.clone());

        bluetooth_media.lock().unwrap().initialize();

    }



    topstack::get_runtime().block_on(async {
@@ -115,7 +118,7 @@ fn main() -> Result<(), Box<dyn Error>> { 
            make_object_name(adapter_index, "adapter"),

            conn.clone(),

            &mut cr,

            bluetooth,

            bluetooth.clone(),

            disconnect_watcher.clone(),

        );

        // Register D-Bus method handlers of IBluetoothGatt.

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

+12 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ use std::sync::Mutex; 


use tokio::sync::mpsc::Sender;



use crate::bluetooth_media::{BluetoothMedia, IBluetoothMedia};

use crate::{Message, RPCProxy};



/// Defines the adapter API.
@@ -113,11 +114,16 @@ pub struct Bluetooth { 
    tx: Sender<Message>,

    local_address: Option<RawAddress>,

    hh: Option<HidHost>,

    bluetooth_media: Arc<Mutex<Box<BluetoothMedia>>>,

}



impl Bluetooth {

    /// Constructs the IBluetooth implementation.

    pub fn new(tx: Sender<Message>, intf: Arc<Mutex<BluetoothInterface>>) -> Bluetooth {

    pub fn new(

        tx: Sender<Message>,

        intf: Arc<Mutex<BluetoothInterface>>,

        bluetooth_media: Arc<Mutex<Box<BluetoothMedia>>>,

    ) -> Bluetooth {

        Bluetooth {

            tx,

            intf,
@@ -126,6 +132,7 @@ impl Bluetooth { 
            callbacks_last_id: 0,

            local_address: None,

            hh: None,

            bluetooth_media,

        }

    }
@@ -205,6 +212,10 @@ pub fn get_bt_dispatcher(tx: Sender<Message>) -> BaseCallbacksDispatcher { 
impl BtifBluetoothCallbacks for Bluetooth {

    fn adapter_state_changed(&mut self, state: BtState) {

        self.state = state;



        if self.state == BtState::On {

            self.bluetooth_media.lock().unwrap().initialize();

        }

    }



    #[allow(unused_variables)]

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

+3 −0
Original line number Diff line number Diff line
@@ -189,6 +189,9 @@ impl IBluetoothMedia for BluetoothMedia { 
    }



    fn initialize(&mut self) -> bool {

        if self.initialized {

            return false;

        }

        self.initialized = true;



        // TEST A2dp