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

Commit 8f8412a8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge changes Iabe05522,I7f873542 am: 7b1d3570 am: ce077032 am: 19f88e0d 

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



Change-Id: I2c1d0cf2ca6dd668410f101017b9da71a5785134
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 66888193 19f88e0d

system/gd/rust/linux/mgmt/src/state_machine.rs

+1 −1
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ impl StateMachineProxy { 
            .unwrap()

            .iter()

            // Filter to adapters that are present or enabled.

            .filter(|&(_, a)| a.present)

            .filter(|&(_, a)| a.present || state_to_enabled(a.state))

            .map(|(_, a)| a.clone())

            .collect::<Vec<AdapterState>>()

    }

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

+7 −4
Original line number Diff line number Diff line
@@ -3518,10 +3518,13 @@ impl BtifGattServerCallbacks for BluetoothGatt { 
            self.server_context_map.delete_service(server_id, handle);

        }



        if let Some(server) = self.server_context_map.get_by_server_id(server_id) {

            if let Some(cb) =

                self.server_context_map.get_callback_from_callback_id(server.cbid).as_mut()

            {

        let cbid = self

            .server_context_map

            .get_by_server_id(server_id)

            .and_then(|server| Some(server.cbid));



        if let Some(cbid) = cbid {

            if let Some(cb) = self.server_context_map.get_callback_from_callback_id(cbid).as_mut() {

                cb.on_service_removed(status, handle);

            }

        }

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

+10 −10
Original line number Diff line number Diff line
@@ -225,26 +225,26 @@ impl BtSocket { 


    pub fn send_msc(&self, dlci: u8, addr: RawAddress) -> BtStatus {

        // PORT_DTRDSR_ON | PORT_CTSRTS_ON | PORT_DCD_ON

        const default_modem_signal: u8 = 0x01 | 0x02 | 0x08;

        const DEFAULT_MODEM_SIGNAL: u8 = 0x01 | 0x02 | 0x08;



        const default_break_signal: u8 = 0;

        const default_discard_buffers: u8 = 0;

        const default_break_signal_seq: u8 = 1; // In sequence.

        const DEFAULT_BREAK_SIGNAL: u8 = 0;

        const DEFAULT_DISCARD_BUFFERS: u8 = 0;

        const DEFAULT_BREAK_SIGNAL_SEQ: u8 = 1; // In sequence.



        // In RFCOMM/DEVA-DEVB/RFC/BV-21-C and RFCOMM/DEVA-DEVB/RFC/BV-22-C test flow

        // we are requested to send an MSC command with FC=0.

        const fc: bool = false;

        const FC: bool = false;



        ccall!(

            self,

            control_req,

            dlci,

            &addr,

            default_modem_signal,

            default_break_signal,

            default_discard_buffers,

            default_break_signal_seq,

            fc

            DEFAULT_MODEM_SIGNAL,

            DEFAULT_BREAK_SIGNAL,

            DEFAULT_DISCARD_BUFFERS,

            DEFAULT_BREAK_SIGNAL_SEQ,

            FC

        )

        .into()

    }