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

Commit ca85188f authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Merge "Floss: Fix scanner obj path" am: 9b38eb17 am: 8fa9c2e7 am:... 

Merge "Merge "Floss: Fix scanner obj path" am: 9b38eb17 am: 8fa9c2e7 am: 0e5297ea" into tm-d1-dev-plus-aosp am: b4cac40f

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



Change-Id: I109610fc81639d209132253f235af2f65db3564a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 145698d1 b4cac40f

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

+3 −1
Original line number Diff line number Diff line
@@ -369,6 +369,8 @@ async fn start_interactive_shell( 
                    format!("/org/chromium/bluetooth/client/{}/bluetooth_conn_callback", adapter);

                let suspend_cb_objpath: String =

                    format!("/org/chromium/bluetooth/client/{}/suspend_callback", adapter);

                let scanner_cb_objpath: String =

                    format!("/org/chromium/bluetooth/client/{}/scanner_callback", adapter);



                let dbus_connection = context.lock().unwrap().dbus_connection.clone();

                let dbus_crossroads = context.lock().unwrap().dbus_crossroads.clone();
@@ -413,7 +415,7 @@ async fn start_interactive_shell( 
                    .unwrap()

                    .rpc

                    .register_scanner_callback(Box::new(ScannerCallback::new(

                        cb_objpath.clone(),

                        scanner_cb_objpath.clone(),

                        context.clone(),

                        dbus_connection.clone(),

                        dbus_crossroads.clone(),