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

Commit 713c7486 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Automerger Merge Worker
Browse files

floss: Export dbus before initializing stack am: 6d8725c9 am: 96344f45 

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



Change-Id: Iba91eb2ea8a532bd5a2b29ed952c6f53f4ca82d2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e284b6b9 96344f45

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

+18 −15
Original line number Original line Diff line number Diff line
@@ -76,19 +76,6 @@ fn main() -> Result<(), Box<dyn Error>> { 




    let adapter_index = get_adapter_index(&args);

    let adapter_index = get_adapter_index(&args);





    // Hold locks and initialize all interfaces.

    {

        intf.lock().unwrap().initialize(get_bt_dispatcher(tx.clone()), args);



        bluetooth_media.lock().unwrap().set_adapter(bluetooth.clone());



        let mut bluetooth = bluetooth.lock().unwrap();

        bluetooth.init_profiles();

        bluetooth.enable();



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

    }



    topstack::get_runtime().block_on(async {

    topstack::get_runtime().block_on(async {

        // Connect to D-Bus system bus.

        // Connect to D-Bus system bus.

        let (resource, conn) = connection::new_system_sync()?;

        let (resource, conn) = connection::new_system_sync()?;
@@ -138,7 +125,7 @@ fn main() -> Result<(), Box<dyn Error>> { 
            make_object_name(adapter_index, "gatt"),

            make_object_name(adapter_index, "gatt"),

            conn.clone(),

            conn.clone(),

            &mut cr,

            &mut cr,

            bluetooth_gatt,

            bluetooth_gatt.clone(),

            disconnect_watcher.clone(),

            disconnect_watcher.clone(),

        );

        );
@@ -146,7 +133,7 @@ fn main() -> Result<(), Box<dyn Error>> { 
            make_object_name(adapter_index, "media"),

            make_object_name(adapter_index, "media"),

            conn.clone(),

            conn.clone(),

            &mut cr,

            &mut cr,

            bluetooth_media,

            bluetooth_media.clone(),

            disconnect_watcher.clone(),

            disconnect_watcher.clone(),

        );

        );
@@ -158,6 +145,22 @@ fn main() -> Result<(), Box<dyn Error>> { 
            disconnect_watcher.clone(),

            disconnect_watcher.clone(),

        );

        );





        // Hold locks and initialize all interfaces. This must be done AFTER DBus is

        // initialized so DBus can properly enforce user policies.

        {

            intf.lock().unwrap().initialize(get_bt_dispatcher(tx.clone()), args);



            bluetooth_media.lock().unwrap().set_adapter(bluetooth.clone());



            let mut bluetooth = bluetooth.lock().unwrap();

            bluetooth.init_profiles();

            bluetooth.enable();



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

        }



        // Start listening on DBus after exporting interfaces and initializing

        // all bluetooth objects.

        conn.start_receive(

        conn.start_receive(

            MatchRule::new_method_call(),

            MatchRule::new_method_call(),

            Box::new(move |msg, conn| {

            Box::new(move |msg, conn| {