commit 3d25b57a776dd437f5ae69963d5705ff6704225d
author Alan Stokes <alanstokes@google.com> Fri Sep 17 08:18:16 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Sep 17 08:18:16 2021 +0000
tree a84773f98896b701ec88142a96a24591a68e859c
parent 97fe2c8af318ad5c81a9f22514f3acdca8de704f
parent 7e6ce05500cb44b41386ca8941af13383100c0aa

Merge "Implement IntoRawFd for ParcelFileDescriptor." am: 7e6ce05500

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

Change-Id: I7678acfbd02a52e8182d25a8b2c4168e56fd63ed

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

diff --git a/libs/binder/rust/src/parcel/file_descriptor.rs b/libs/binder/rust/src/parcel/file_descriptor.rs
index 179b7c8..f71a686 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, 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 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();