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

Commit b68de61e authored by Sonny Sasaka's avatar Sonny Sasaka Committed by Automerger Merge Worker
Browse files

floss: Fix build breakage am: edf27c52 

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

Change-Id: I4baac40b34836c36d0634fc075b443b4d7412fb4
parents 031ab8e3 edf27c52

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

+32 −4
Original line number Diff line number Diff line
@@ -908,13 +908,27 @@ pub(crate) trait BtifGattClientCallbacks { 
    fn read_characteristic_cb(&mut self, conn_id: i32, status: i32, data: BtGattReadParams);



    #[btif_callback(WriteCharacteristic)]

    fn write_characteristic_cb(&mut self, conn_id: i32, status: i32, handle: u16);

    fn write_characteristic_cb(

        &mut self,

        conn_id: i32,

        status: i32,

        handle: u16,

        len: u16,

        value: *const u8,

    );



    #[btif_callback(ReadDescriptor)]

    fn read_descriptor_cb(&mut self, conn_id: i32, status: i32, data: BtGattReadParams);



    #[btif_callback(WriteDescriptor)]

    fn write_descriptor_cb(&mut self, conn_id: i32, status: i32, handle: u16);

    fn write_descriptor_cb(

        &mut self,

        conn_id: i32,

        status: i32,

        handle: u16,

        len: u16,

        value: *const u8,

    );



    #[btif_callback(ExecuteWrite)]

    fn execute_write_cb(&mut self, conn_id: i32, status: i32);
@@ -1051,7 +1065,14 @@ impl BtifGattClientCallbacks for BluetoothGatt { 
        );

    }



    fn write_characteristic_cb(&mut self, conn_id: i32, mut status: i32, handle: u16) {

    fn write_characteristic_cb(

        &mut self,

        conn_id: i32,

        mut status: i32,

        handle: u16,

        _len: u16,

        _value: *const u8,

    ) {

        let address = self.context_map.get_address_by_conn_id(conn_id);

        if address.is_none() {

            return;
@@ -1102,7 +1123,14 @@ impl BtifGattClientCallbacks for BluetoothGatt { 
        );

    }



    fn write_descriptor_cb(&mut self, conn_id: i32, status: i32, handle: u16) {

    fn write_descriptor_cb(

        &mut self,

        conn_id: i32,

        status: i32,

        handle: u16,

        _len: u16,

        _value: *const u8,

    ) {

        let address = self.context_map.get_address_by_conn_id(conn_id);

        if address.is_none() {

            return;

system/gd/rust/topshim/src/profiles/gatt.rs

+1 −0
Original line number Diff line number Diff line
@@ -433,6 +433,7 @@ unsafe impl Send for RawBleScannerWrapper {} 
unsafe impl Send for RawBleAdvertiserWrapper {}

unsafe impl Send for btgatt_callbacks_t {}

unsafe impl Send for GattClient {}

unsafe impl Send for GattClientCallbacks {}



pub struct GattClient {

    internal: RawGattClientWrapper,