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

Commit cbdb0d9d authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Gerrit Code Review
Browse files

Merge "Floss: Add logs to debug lost bond"

parents c604a0e2 d51c7e0a

system/gd/rust/linux/mgmt/src/migrate.rs

+2 −1
Original line number Diff line number Diff line
@@ -533,6 +533,7 @@ pub fn migrate_bluez_devices() { 
                for (sec, props) in ini {

                    // Drop devices that don't exist in BlueZ

                    if sec.contains(":") && !devices.contains(&sec) {

                        info!("Dropping a device in Floss that doesn't exist in BlueZ");

                        continue;

                    }

                    // Keep keys that weren't transferrable
@@ -551,7 +552,7 @@ pub fn migrate_bluez_devices() { 
        // Write contents to file

        match conf.write(FLOSS_CONF_FILE) {

            Ok(_) => {

                debug!("Successfully migrated devices from BlueZ to Floss for adapter {}", adapter);

                info!("Successfully migrated devices from BlueZ to Floss for adapter {}", adapter);

            }

            Err(err) => {

                error!(

system/gd/rust/linux/stack/src/bluetooth.rs

+3 −0
Original line number Diff line number Diff line
@@ -1394,6 +1394,9 @@ impl IBluetooth for Bluetooth { 
    }



    fn remove_bond(&self, device: BluetoothDevice) -> bool {

        // Temporary for debugging b/255849761. Should change to debug after fix.

        log::info!("Removing bond for {}", device.address);



        let addr = RawAddress::from_string(device.address.clone());



        if addr.is_none() {