Merge "Implement IntoRawFd for ParcelFileDescriptor." am: 7e6ce05500 am:... (df41c269) · Commits · e / os / android_frameworks_native-old

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();