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

Commit fed21690 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "floss: pad zero when convert to little endian" into main am: e64840da... 

Merge "floss: pad zero when convert to little endian" into main am: e64840da am: 962f850a am: f5373371 am: b921659e

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



Change-Id: Ifbdc3156e7857fff8c25d718e9ffa8196fa9c589
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 65fda17a b921659e

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

+7 −2
Original line number Diff line number Diff line
@@ -246,9 +246,9 @@ fn reverse_endianness(str: String, uppercase: bool) -> Result<String, String> { 
    match u128::from_str_radix(&s, 16) {

        Ok(x) => {

            if uppercase {

                Ok(format!("{:X}", x.swap_bytes()))

                Ok(format!("{:0>32X}", x.swap_bytes()))

            } else {

                Ok(format!("{:x}", x.swap_bytes()))

                Ok(format!("{:0>32x}", x.swap_bytes()))

            }

        }

        Err(err) => Err(format!("Error converting link key: {}", err)),
@@ -961,6 +961,11 @@ mod tests { 
            key.apply_action("00112233445566778899AABBCCDDEE".to_string()),

            Ok("eeddccbbaa9988776655443322110000".to_string())

        );

        // Conversion shouldn't lose leading zeros

        assert_eq!(

            key.apply_action("112233445566778899AABBCCDDEE0000".to_string()),

            Ok("0000eeddccbbaa998877665544332211".to_string())

        );

    }



    #[test]