From 232d0b3721be5009bdbda017496ee9c205e39d23 Mon Sep 17 00:00:00 2001
From: Tomasz Wasilczyk <twasilczyk@google.com>
Date: Mon, 9 Oct 2023 17:37:16 +0000
Subject: Disable native_handle outside of Android

Bug: 302723053
Test: mma
Change-Id: Ia6d80574a3b137c7646b4a8a7575e03197fcb527
---
 libs/binder/Parcel.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libs/binder/Parcel.cpp')

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index a59b9284fc..17bdc455be 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1436,6 +1436,7 @@ status_t Parcel::writeRawNullableParcelable(const Parcelable* parcelable) {
     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 @@ status_t Parcel::writeNativeHandle(const native_handle* handle)
     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 @@ int32_t Parcel::readExceptionCode() const
     return status.exceptionCode();
 }
 
+#ifndef BINDER_DISABLE_NATIVE_HANDLE
 native_handle* Parcel::readNativeHandle() const
 {
     int numFds, numInts;
@@ -2271,6 +2274,7 @@ native_handle* Parcel::readNativeHandle() const
     }
     return h;
 }
+#endif
 
 int Parcel::readFileDescriptor() const {
     if (const auto* rpcFields = maybeRpcFields()) {
-- 
cgit v1.2.3-59-g8ed1b