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

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

floss: Adv/Gatt: Apply DisplayAddress for logging 

Bug: 342337056
Tag: #floss
Test: mmm packages/modules/Bluetooth
Flag: EXEMPT, Floss-only changes
Change-Id: I6e396e49b0dd94fbd8937292e3f6958ac5650e32
parent bcebe213

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

+5 −3
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


use btif_macros::{btif_callback, btif_callbacks_dispatcher};



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

use bt_topshim::btif::{DisplayAddress, RawAddress, Uuid};

use bt_topshim::profiles::gatt::{AdvertisingStatus, Gatt, GattAdvCallbacks, LeDiscMode, LePhy};



use itertools::Itertools;
@@ -1380,8 +1380,10 @@ impl BtifGattAdvCallbacks for AdvertiseManagerImpl { 


    fn on_own_address_read(&mut self, adv_id: u8, addr_type: u8, address: RawAddress) {

        debug!(

            "on_own_address_read(): adv_id = {}, addr_type = {}, address = {:?}",

            adv_id, addr_type, address

            "on_own_address_read(): adv_id = {}, addr_type = {}, address = {}",

            adv_id,

            addr_type,

            DisplayAddress(&address)

        );



        let advertiser_id: i32 = adv_id.into();

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

+21 −22
Original line number Diff line number Diff line
@@ -3,7 +3,9 @@ 
use btif_macros::{btif_callback, btif_callbacks_dispatcher};



use bt_topshim::bindings::root::bluetooth::Uuid;

use bt_topshim::btif::{BluetoothInterface, BtStatus, BtTransport, RawAddress, Uuid128Bit};

use bt_topshim::btif::{

    BluetoothInterface, BtStatus, BtTransport, DisplayAddress, RawAddress, Uuid128Bit,

};

use bt_topshim::profiles::gatt::{

    ffi::RustAdvertisingTrackInfo, AdvertisingStatus, BtGattDbElement, BtGattNotifyParams,

    BtGattReadParams, BtGattResponse, BtGattValue, Gatt, GattAdvCallbacksDispatcher,
@@ -1807,12 +1809,12 @@ impl BluetoothGatt { 
                    log::debug!(

                        "Added addr monitor {} and updated bd_addr={} to addr filter map",

                        monitor_handle,

                        addr_info.bd_addr.to_string()

                        DisplayAddress(&addr_info.bd_addr)

                    );

                    return;

                } else {

                    log::debug!("add_child_monitor: bd_addr {} has been removed, removing the addr monitor {}.",

                        addr_info.bd_addr.to_string(),

                        DisplayAddress(&addr_info.bd_addr),

                        monitor_handle);

                }

            } else {
@@ -4193,16 +4195,14 @@ impl BtifGattScannerInbandCallbacks for BluetoothGatt { 
        interval: u16,

    ) {

        log::debug!(

            "Callback received: {:#?}",

            GattScannerInbandCallbacks::StartSyncCallback(

            "Callback received: StartSyncCallback({}, {}, {}, {}, {}, {}, {})",

            status,

            sync_handle,

            advertising_sid,

            address_type,

                address,

            DisplayAddress(&address),

            phy,

                interval,

            )

            interval

        );

    }
@@ -4235,8 +4235,9 @@ impl BtifGattScannerInbandCallbacks for BluetoothGatt { 


    fn inband_sync_transfer_callback(&mut self, status: u8, address: RawAddress) {

        log::debug!(

            "Callback received: {:#?}",

            GattScannerInbandCallbacks::SyncTransferCallback(status, address)

            "Callback received: SyncTransferCallback({}, {})",

            status,

            DisplayAddress(&address)

        );

    }

}
@@ -4309,6 +4310,7 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 


    fn on_track_adv_found_lost(&mut self, track_adv_info: RustAdvertisingTrackInfo) {

        let addr = track_adv_info.advertiser_address.to_string();

        let display_addr = DisplayAddress(&track_adv_info.advertiser_address);

        let mut binding = self.scanners.lock().unwrap();

        let mut corresponding_scanner: Option<&mut ScannerInfo> =

            binding.values_mut().find_map(|scanner| {
@@ -4352,13 +4354,13 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 
                if corresponding_scanner.addr_handle_map.contains_key(&addr) {

                    log::debug!(

                        "on_track_adv_found_lost: this addr {} is already handled, just return",

                        track_adv_info.advertiser_address.to_string()

                        display_addr

                    );

                    return;

                }

                log::debug!(

                    "on_track_adv_found_lost: state == 0x01, adding addr {} to map",

                    addr.clone()

                    display_addr

                );

                corresponding_scanner.addr_handle_map.insert(addr.clone(), None);
@@ -4381,10 +4383,7 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 
            } else {

                if let Some(handle) = corresponding_scanner.monitor_handle {

                    if handle == track_adv_info.monitor_handle {

                        log::info!(

                            "pattern filter lost, addr={}",

                            track_adv_info.advertiser_address.to_string()

                        );

                        log::info!("pattern filter lost, addr={}", display_addr);

                        return;

                    }

                }
@@ -4392,7 +4391,7 @@ impl BtifGattScannerCallbacks for BluetoothGatt { 
                if corresponding_scanner.addr_handle_map.remove(&addr).is_some() {

                    log::debug!(

                        "on_track_adv_found_lost: removing addr = {} from map",

                        addr.clone()

                        display_addr

                    );

                    self.remove_child_monitor(scanner_id, track_adv_info.monitor_handle);

                }