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

Commit 342f54b2 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Automerger Merge Worker
Browse files

Merge "floss: Use into_raw_fd to convert unixstream" am: 6e2565e8 am: d3deb6fd 

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



Change-Id: Iafaac1c50ae4312f14f95b2247e7d1988292804a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfbf8386 d3deb6fd

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

+5 −1
Original line number Diff line number Diff line
@@ -366,7 +366,11 @@ impl InternalConnectingSocket { 
// an open and valid file to operate on, converting to file via RawFd is just

// boilerplate.

fn unixstream_to_file(stream: UnixStream) -> std::fs::File {

    unsafe { std::fs::File::from_raw_fd(stream.as_raw_fd()) }

    unsafe {

        std::fs::File::from_raw_fd(

            stream.into_std().expect("Failed to convert tokio unixstream").into_raw_fd(),

        )

    }

}



// This is a safe operation in an unsafe wrapper. A file is already open and owned