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

Commit 2761bb9b authored by Yun-hao Chung's avatar Yun-hao Chung Committed by Automerger Merge Worker
Browse files

Merge "Floss: enabling logger earlier" am: 13a42062 am: 36b249a8 am:... 

Merge "Floss: enabling logger earlier" am: 13a42062 am: 36b249a8 am: e0ff46b3 am: 27c46e83 am: 26d62005

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



Change-Id: I0280ddd5d9f3802fd43661e159f53c30c22dc08d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30e20851 26d62005

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

+1 −1
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ fn main() -> Result<(), Box<dyn Error>> { 


    // Forward --hci to Fluoride.

    init_flags.push(format!("--hci={}", hci_index));

    let logging = Arc::new(Mutex::new(Box::new(BluetoothLogging::new(is_debug, log_output))));



    // Always treat discovery as classic only

    init_flags.push(String::from("INIT_classic_discovery_only=true"));
@@ -174,7 +175,6 @@ fn main() -> Result<(), Box<dyn Error>> { 
        bluetooth_media.clone(),

        tx.clone(),

    ))));

    let logging = Arc::new(Mutex::new(Box::new(BluetoothLogging::new(is_debug, log_output))));

    let bt_sock_mgr = Arc::new(Mutex::new(Box::new(BluetoothSocketManager::new(tx.clone()))));

    let qa = Arc::new(Mutex::new(Box::new(BluetoothQA::new(tx.clone()))));