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

Commit 139475a2 authored by Sonny Sasaka's avatar Sonny Sasaka
Browse files

Floss: Fix scanner obj path 

Wrong obj path overwrites another callback.

Bug: 217273154
Tag: #floss
Test: Manual - run btclient

Change-Id: I8a04c09d2f7308acecb29eaeb003c191089b4d3c
parent c7fc60e3

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

+3 −1
Original line number Diff line number Diff line
@@ -338,6 +338,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();
@@ -382,7 +384,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(),