commit 232d0b3721be5009bdbda017496ee9c205e39d23
author Tomasz Wasilczyk <twasilczyk@google.com> Mon Oct 09 17:37:16 2023 +0000
committer Tomasz Wasilczyk <twasilczyk@google.com> Thu Oct 19 16:33:53 2023 +0000
tree e7111ebc3d7f2fc52f8798d48fefb19840fdab31
parent 5bd4fecba94f654b1437c9d8970bf65f087c8a74

Disable native_handle outside of Android

Bug: 302723053
Test: mma
Change-Id: Ia6d80574a3b137c7646b4a8a7575e03197fcb527

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index a59b928..17bdc45 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1436,6 +1436,7 @@
     return writeParcelable(*parcelable);
 }
 
+#ifndef BINDER_DISABLE_NATIVE_HANDLE
 status_t Parcel::writeNativeHandle(const native_handle* handle)
 {
     if (!handle || handle->version != sizeof(native_handle))
@@ -1458,6 +1459,7 @@
     err = write(handle->data + handle->numFds, sizeof(int)*handle->numInts);
     return err;
 }
+#endif
 
 status_t Parcel::writeFileDescriptor(int fd, bool takeOwnership) {
     if (auto* rpcFields = maybeRpcFields()) {
@@ -2239,6 +2241,7 @@
     return status.exceptionCode();
 }
 
+#ifndef BINDER_DISABLE_NATIVE_HANDLE
 native_handle* Parcel::readNativeHandle() const
 {
     int numFds, numInts;
@@ -2271,6 +2274,7 @@
     }
     return h;
 }
+#endif
 
 int Parcel::readFileDescriptor() const {
     if (const auto* rpcFields = maybeRpcFields()) {