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

Commit e409e87f authored by Victor Hsieh's avatar Victor Hsieh Committed by Automerger Merge Worker
Browse files

Merge "Implement AsRawFd trait for ParcelFileDescriptor" am: 385a3a02

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1789493

Change-Id: Ic387cbf57fa4d19f207efb30bfcfc36d7670dd7c
parents 0903e22d 385a3a02
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ use crate::error::{status_result, Result, StatusCode};
use crate::sys;

use std::fs::File;
use std::os::unix::io::{AsRawFd, FromRawFd};
use std::os::unix::io::{AsRawFd, FromRawFd, RawFd};

/// Rust version of the Java class android.os.ParcelFileDescriptor
#[derive(Debug)]
@@ -48,6 +48,12 @@ impl From<ParcelFileDescriptor> for File {
    }
}

impl AsRawFd for ParcelFileDescriptor {
    fn as_raw_fd(&self) -> RawFd {
        self.0.as_raw_fd()
    }
}

impl Serialize for ParcelFileDescriptor {
    fn serialize(&self, parcel: &mut Parcel) -> Result<()> {
        let fd = self.0.as_raw_fd();