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

Commit dfd6dd87 authored by Hsin-chen Chuang's avatar Hsin-chen Chuang
Browse files

floss: Split out Advertiser code from bluetooth_gatt to bluetooth_adv 

This patch doesn't yet make any DBus and behavior changes. The events
are still dispatched to bluetooth_gatt and then passed to bluetooth_adv.

Notable changes:
- Added IBluetoothAdvertiseManager trait and rename Advertisers to
  AdvertiseManager (follow Android naming)
- Deprecate *_sets_mut helpers because they hold the ownership of the
  whole structure and block the use of self.gatt.

Bug: 242083290
Tag: #floss
Test: mmm packages/modules/Bluetooth
Test: bluetooth_AdapterAdvHealth.all_floss
Flag: EXEMPT, Floss-only changes

Change-Id: I75a599a7ad825c07a108be31a213e6ae0dd532bf
parent 45238a9d

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};