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

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

Merge "floss: Parse manufacturer data as little endian" into main am: 799e1aa3 

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



Change-Id: Ic3636f326879c573b2043863880cdf7e1829d02b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0ddc82ea 799e1aa3

system/gd/rust/linux/utils/src/adv_parser.rs

+3 −3
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ pub fn extract_service_data(bytes: &[u8]) -> HashMap<String, Vec<u8>> { 
pub fn extract_manufacturer_data(bytes: &[u8]) -> HashMap<u16, Vec<u8>> {

    iterate_adv_data(bytes, MANUFACTURER_SPECIFIC_DATA)

        .filter_map(|slice| {

            slice.get(0..2)?.try_into().ok().map(|be| (u16::from_be_bytes(be), slice[2..].to_vec()))

            slice.get(0..2)?.try_into().ok().map(|le| (u16::from_le_bytes(le), slice[2..].to_vec()))

        })

        .collect()

}
@@ -375,7 +375,7 @@ mod tests { 
            vec![4, MANUFACTURER_SPECIFIC_DATA, 0, 1, 2, 3, MANUFACTURER_SPECIFIC_DATA, 1, 2];

        let manufacturer_data = extract_manufacturer_data(payload.as_slice());

        assert_eq!(manufacturer_data.len(), 2);

        assert_eq!(manufacturer_data.get(&1), Some(&vec![2]));

        assert_eq!(manufacturer_data.get(&258), Some(&vec![]));

        assert_eq!(manufacturer_data.get(&256), Some(&vec![2]));

        assert_eq!(manufacturer_data.get(&513), Some(&vec![]));

    }

}