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

Commit fb485fcf authored by Ying Hsu's avatar Ying Hsu Committed by Automerger Merge Worker
Browse files

Merge "floss: Remove build warnings for redundant cloning of str" into main... 

Merge "floss: Remove build warnings for redundant cloning of str" into main am: ed856bb8 am: bead927b

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



Change-Id: I983a0175f3f92a0b4a6e59f201111c235990d9dd
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eaea5ae5 bead927b

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

+3 −3
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ fn convert_from_bluez_device( 
                                return false;

                            }

                        };

                        floss_conf.set(addr_lower.as_str(), key.key.clone(), Some(new_val));

                        floss_conf.set(addr_lower.as_str(), key.key, Some(new_val));

                    }

                }

                None => {
@@ -810,7 +810,7 @@ fn convert_floss_conf(filename: &str) { 
                            continue;

                        }

                    };

                    bluez_info.set(key.section, key.key.clone(), Some(new_val));

                    bluez_info.set(key.section, key.key, Some(new_val));

                    continue;

                }

                None => {
@@ -828,7 +828,7 @@ fn convert_floss_conf(filename: &str) { 
                            continue;

                        }

                    };

                    bluez_hid.set(key.section, key.key.clone(), Some(new_val));

                    bluez_hid.set(key.section, key.key, Some(new_val));

                }

                None => {

                    debug!("No key match: {}", k)