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

Commit 8fa9c2e7 authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

Merge "Floss: Fix scanner obj path" am: 9b38eb17 

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



Change-Id: I83e07465359eecb595a56ae2d1c33df15e6c1d55
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f4231e2a 9b38eb17

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(),