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

Commit a8e910de authored by Sonny Sasaka's avatar Sonny Sasaka
Browse files

floss: Handle callbacks from btgatt_client_callbacks_t 

This adds handlers for:
* disconnect_cb
* search_complete_cb
* register_for_notification_cb
* notify_cb

Bug: 193685325
Tag: #floss
Test: Build floss on Linux and AOSP

Change-Id: I093f0b3f4394d9cdc641ae74a15896dd479eb24f
parent e038a7bd

system/gd/rust/linux/service/src/iface_bluetooth_gatt.rs

+3 −0
Original line number Diff line number Diff line
@@ -46,6 +46,9 @@ impl IBluetoothGattCallback for BluetoothGattCallbackDBus { 
    #[dbus_method("OnPhyRead")]

    fn on_phy_read(&self, addr: String, tx_phy: LePhy, rx_phy: LePhy, status: GattStatus) {}



    #[dbus_method("OnNotify")]

    fn on_notify(&self, addr: String, handle: i32, value: Vec<u8>) {}



    #[dbus_method("OnReadRemoteRssi")]

    fn on_read_remote_rssi(&self, addr: String, rssi: i32, status: i32) {}

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

+73 −2
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ use btif_macros::{btif_callback, btif_callbacks_dispatcher}; 
use bt_topshim::bindings::root::bluetooth::Uuid;

use bt_topshim::btif::{BluetoothInterface, RawAddress};

use bt_topshim::profiles::gatt::{

    Gatt, GattClientCallbacks, GattClientCallbacksDispatcher, GattServerCallbacksDispatcher,

    GattStatus,

    BtGattNotifyParams, Gatt, GattClientCallbacks, GattClientCallbacksDispatcher,

    GattServerCallbacksDispatcher, GattStatus,

};

use bt_topshim::topstack;
@@ -94,6 +94,10 @@ impl ContextMap { 
        self.connections.push(Connection { conn_id, address: address.clone(), client_id });

    }



    fn remove_connection(&mut self, _client_id: i32, conn_id: i32) {

        self.connections.retain(|conn| conn.conn_id != conn_id);

    }



    fn get_conn_id_from_address(&self, client_id: i32, address: &String) -> Option<i32> {

        match self

            .connections
@@ -249,6 +253,9 @@ pub trait IBluetoothGattCallback: RPCProxy { 
    /// The completion of IBluetoothGatt::read_phy.

    fn on_phy_read(&self, addr: String, tx_phy: LePhy, rx_phy: LePhy, status: GattStatus);



    /// When notification or indication is received.

    fn on_notify(&self, addr: String, handle: i32, value: Vec<u8>);



    /// The completion of IBluetoothGatt::read_remote_rssi.

    fn on_read_remote_rssi(&self, addr: String, rssi: i32, status: i32);
@@ -738,6 +745,24 @@ pub(crate) trait BtifGattClientCallbacks { 
    #[btif_callback(Connect)]

    fn connect_cb(&mut self, conn_id: i32, status: i32, client_id: i32, addr: RawAddress);



    #[btif_callback(Disconnect)]

    fn disconnect_cb(&mut self, conn_id: i32, status: i32, client_id: i32, addr: RawAddress);



    #[btif_callback(SearchComplete)]

    fn search_complete_cb(&mut self, conn_id: i32, status: i32);



    #[btif_callback(RegisterForNotification)]

    fn register_for_notification_cb(

        &mut self,

        conn_id: i32,

        registered: i32,

        status: i32,

        handle: u16,

    );



    #[btif_callback(Notify)]

    fn notify_cb(&mut self, conn_id: i32, data: BtGattNotifyParams);



    #[btif_callback(ReadRemoteRssi)]

    fn read_remote_rssi_cb(&mut self, client_id: i32, addr: RawAddress, rssi: i32, status: i32);
@@ -798,6 +823,52 @@ impl BtifGattClientCallbacks for BluetoothGatt { 
        );

    }



    fn disconnect_cb(&mut self, conn_id: i32, status: i32, client_id: i32, addr: RawAddress) {

        self.context_map.remove_connection(client_id, conn_id);

        let client = self.context_map.get_by_client_id(client_id);

        if client.is_none() {

            return;

        }



        client.unwrap().callback.on_client_connection_state(

            status,

            client_id,

            match GattStatus::from_i32(status) {

                None => false,

                Some(gatt_status) => gatt_status == GattStatus::Success,

            },

            addr.to_string(),

        );

    }



    fn search_complete_cb(&mut self, conn_id: i32, _status: i32) {

        // Gatt DB is ready!

        self.gatt.as_ref().unwrap().client.get_gatt_db(conn_id);

    }



    fn register_for_notification_cb(

        &mut self,

        _conn_id: i32,

        _registered: i32,

        _status: i32,

        _handle: u16,

    ) {

        // No-op.

    }



    fn notify_cb(&mut self, conn_id: i32, data: BtGattNotifyParams) {

        let client = self.context_map.get_client_by_conn_id(conn_id);

        if client.is_none() {

            return;

        }



        client.unwrap().callback.on_notify(

            RawAddress { val: data.bda.address }.to_string(),

            data.handle as i32,

            data.value[0..data.len as usize].to_vec(),

        );

    }



    fn read_remote_rssi_cb(&mut self, client_id: i32, addr: RawAddress, rssi: i32, status: i32) {

        let client = self.context_map.get_by_client_id(client_id);

        if client.is_none() {