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

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

Merge "Floss: Refactor send_response to pass the value correctly" am:... 

Merge "Floss: Refactor send_response to pass the value correctly" am: e95713d0 am: 52b7074a am: 706eaa60

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



Change-Id: I2447ec94f03e21e234810d895174f3bfb9d3c06c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6582a8a1 706eaa60

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

+9 −1
Original line number Diff line number Diff line
@@ -2484,7 +2484,15 @@ impl IBluetoothGatt for BluetoothGatt { 
            let conn_id = self.server_context_map.get_conn_id_from_address(server_id, &addr)?;

            let handle = self.server_context_map.get_request_handle_from_id(request_id)?;

            let len = value.len() as u16;

            let data: [u8; 600] = value.try_into().ok()?;



            let data: [u8; 600] = value

                .iter()

                .chain(std::iter::repeat(&0))

                .take(600)

                .cloned()

                .collect::<Vec<u8>>()

                .try_into()

                .ok()?;



            self.gatt.as_ref().unwrap().lock().unwrap().server.send_response(

                conn_id,