Merge "floss: pad zero when convert to little endian" into main (e64840da) · Commits · e / os / android_packages_modules_Bluetooth

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]