| commit | e409e87f0ac04ac057357538087ae624965077e4 | [log] [tgz] |
|---|---|---|
| author | Victor Hsieh <victorhsieh@google.com> | Mon Aug 09 15:39:22 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Aug 09 15:39:22 2021 +0000 |
| tree | 392ef65120d63a57b0847bfd68171f3064ee5c2e | |
| parent | 0903e22d842631066c1b25b8a2b2fbe214e0d021 [diff] | |
| parent | 385a3a02d0f2f3fb0e8b04176e9799cfccdb738c [diff] |
Merge "Implement AsRawFd trait for ParcelFileDescriptor" am: 385a3a02d0 Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1789493 Change-Id: Ic387cbf57fa4d19f207efb30bfcfc36d7670dd7c
diff --git a/libs/binder/rust/src/parcel/file_descriptor.rs b/libs/binder/rust/src/parcel/file_descriptor.rs index 20e9178..179b7c8 100644 --- a/libs/binder/rust/src/parcel/file_descriptor.rs +++ b/libs/binder/rust/src/parcel/file_descriptor.rs
@@ -23,7 +23,7 @@ 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 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();