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

Commit 2a28b187 authored by Alan Stokes's avatar Alan Stokes Committed by Automerger Merge Worker
Browse files

Merge "Implement IntoRawFd for ParcelFileDescriptor." am: 7e6ce055 am: 3d25b57a am: 23dcfeb3 

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

Change-Id: Id4dbaf1c90d6cd611e4dc3dcba51b020f0fdcb4e
parents 1b82817e 23dcfeb3

libs/binder/rust/src/parcel/file_descriptor.rs

+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, RawFd};

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



/// Rust version of the Java class android.os.ParcelFileDescriptor

#[derive(Debug)]
@@ -54,6 +54,12 @@ impl AsRawFd for ParcelFileDescriptor { 
    }

}



impl IntoRawFd for ParcelFileDescriptor {

    fn into_raw_fd(self) -> RawFd {

        self.0.into_raw_fd()

    }

}



impl Serialize for ParcelFileDescriptor {

    fn serialize(&self, parcel: &mut Parcel) -> Result<()> {

        let fd = self.0.as_raw_fd();