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

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

Merge "floss: Remove services_added and services_removed btif callback" am: 5eb35b81 

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1827954

Change-Id: I258750e3ee79ce83741b8d46782ebd5569ed3429
parents 8d026d2b 5eb35b81

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

+4 −18
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ pub enum GattClientCallbacks { 
    ConfigureMtu(i32, i32, i32),

    Congestion(i32, bool),

    GetGattDb(i32, Vec<BtGattDbElement>, i32),

    ServicesRemoved(i32, u16, u16),

    ServicesAdded(i32, Vec<BtGattDbElement>, i32),

    PhyUpdated(i32, u8, u8, u8),

    ConnUpdated(i32, u16, u16, u16, u8),

    ServiceChanged(i32),
@@ -267,20 +265,6 @@ cb_variant!( 
    }

);



cb_variant!(

    GattClientCb,

    gc_services_removed_cb -> GattClientCallbacks::ServicesRemoved,

    i32, u16, u16, {}

);



cb_variant!(

    GattClientCb,

    gc_services_added_cb -> GattClientCallbacks::ServicesAdded,

    i32, *const BtGattDbElement, i32, {

        let _1 = ptr_to_vec(_1, _2 as usize);

    }

);



cb_variant!(

    GattClientCb,

    gc_phy_updated_cb -> GattClientCallbacks::PhyUpdated,
@@ -869,11 +853,13 @@ impl Gatt { 
            configure_mtu_cb: Some(gc_configure_mtu_cb),

            congestion_cb: Some(gc_congestion_cb),

            get_gatt_db_cb: Some(gc_get_gatt_db_cb),

            services_removed_cb: Some(gc_services_removed_cb),

            services_added_cb: Some(gc_services_added_cb),

            phy_updated_cb: Some(gc_phy_updated_cb),

            conn_updated_cb: Some(gc_conn_updated_cb),

            service_changed_cb: Some(gc_service_changed_cb),

            // These callbacks are never used and will also be removed from btif.

            // TODO(b/200073464): Remove these.

            services_removed_cb: None,

            services_added_cb: None,

        });



        let mut gatt_server_callbacks = Box::new(btgatt_server_callbacks_t {