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

Commit 8f20182e authored by Hsin-chen Chuang's avatar Hsin-chen Chuang Committed by Automerger Merge Worker
Browse files

Merge "floss: Split out Advertiser code from bluetooth_gatt to bluetooth_adv"... 

Merge "floss: Split out Advertiser code from bluetooth_gatt to bluetooth_adv" into main am: 739ba89b

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



Change-Id: Ib6e92773bd15a7216f9eba441196ebeb551fdfe4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bd5dd4d1 739ba89b

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

+719 −53

File changed.

Preview size limit exceeded, changes collapsed.

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

+53 −473

File changed.

Preview size limit exceeded, changes collapsed.

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

+3 −3
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ use crate::bluetooth::{ 
    BluetoothDevice, DelayedActions, IBluetooth,

};

use crate::bluetooth_admin::{BluetoothAdmin, IBluetoothAdmin};

use crate::bluetooth_adv::dispatch_le_adv_callbacks;

use crate::bluetooth_gatt::{

    dispatch_gatt_client_callbacks, dispatch_gatt_server_callbacks, dispatch_le_adv_callbacks,

    dispatch_le_scanner_callbacks, dispatch_le_scanner_inband_callbacks, BluetoothGatt,

    GattActions,

    dispatch_gatt_client_callbacks, dispatch_gatt_server_callbacks, dispatch_le_scanner_callbacks,

    dispatch_le_scanner_inband_callbacks, BluetoothGatt, GattActions,

};

use crate::bluetooth_media::{BluetoothMedia, MediaActions};

use crate::dis::{DeviceInformation, ServiceCallbacks};