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

Commit 0782e9a6 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Gerrit Code Review
Browse files

Merge "floss: Construct DisplayAddress by borrowing"

parents b6d9150b 1a164aba

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

+1 −1
Original line number Diff line number Diff line
@@ -1934,7 +1934,7 @@ impl IBluetooth for Bluetooth { 
        // If SDP isn't completed yet, we wait for it to complete and retry the connection again.

        // Otherwise, this connection request is done, no retry is required.

        if !has_enabled_uuids {

            warn!("[{}] SDP hasn't completed for device, wait to connect.", DisplayAddress(addr));

            warn!("[{}] SDP hasn't completed for device, wait to connect.", DisplayAddress(&addr));

            if let Some(d) = self.get_remote_device_if_found_mut(&device.address) {

                if uuids.len() == 0 || !d.services_resolved {

                    d.wait_to_connect = true;

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

+53 −53

File changed.

Preview size limit exceeded, changes collapsed.

system/gd/rust/topshim/src/btif.rs

+2 −2
Original line number Diff line number Diff line
@@ -819,8 +819,8 @@ impl RawAddress { 
}



/// Address that is safe to display in logs.

pub struct DisplayAddress(pub RawAddress);

impl Display for DisplayAddress {

pub struct DisplayAddress<'a>(pub &'a RawAddress);

impl<'a> Display for DisplayAddress<'a> {

    fn fmt(&self, f: &mut Formatter) -> Result {

        write!(f, "xx:xx:xx:xx:{:2X}:{:2X}", &self.0.address[4], &self.0.address[5])

    }