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

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

Merge "Floss: btclient: Implement socket close command" into main am: 01891628 

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



Change-Id: Iacd2db88547f8b0e31d42728a06e1d30a6d06c87
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 49d8310d 01891628

system/gd/rust/linux/client/src/command_handler.rs

+21 −1
Original line number Diff line number Diff line
@@ -251,7 +251,7 @@ fn build_commands() -> HashMap<String, CommandOption> { 
                String::from(

                    "socket connect <address> <l2cap|rfcomm> <psm|uuid> <auth-required> <Bredr|LE>",

                ),

                String::from("socket disconnect <socket_id>"),

                String::from("socket close <socket_id>"),

                String::from("socket set-on-connect-schedule <send|resend|dump>"),

            ],

            description: String::from("Socket manager utilities."),
@@ -1626,6 +1626,26 @@ impl CommandHandler { 
                    status, id, addr, sock_type, psm_or_uuid);

                }

            }

            "close" => {

                let sockid = String::from(get_arg(args, 1)?)

                    .parse::<u64>()

                    .or(Err("Failed parsing socket ID"))?;

                let status = self

                    .context

                    .lock()

                    .unwrap()

                    .socket_manager_dbus

                    .as_mut()

                    .unwrap()

                    .close(callback_id, sockid);

                if status != BtStatus::Success {

                    return Err(format!(

                        "Failed to close the listening socket, status = {:?}",

                        status,

                    )

                    .into());

                }

            }



            _ => return Err(CommandError::InvalidArgs),

        };