Merge "Revert "Add support for unique_fds and vectors of file descriptors"" (5cd09786) · Commits · e / os / platform_frameworks_native

include/binder/Parcel.h

+0 −21

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,6 @@

	#include <vector>		#include <vector>

	#include <base/unique_fd.h>
	#include <cutils/native_handle.h>		#include <cutils/native_handle.h>
	#include <utils/Errors.h>		#include <utils/Errors.h>
	#include <utils/RefBase.h>		#include <utils/RefBase.h>
	@@ -150,17 +149,6 @@ public:
	// will be closed once the parcel is destroyed.		// will be closed once the parcel is destroyed.
	status_t writeDupFileDescriptor(int fd);		status_t writeDupFileDescriptor(int fd);

	// Place a file descriptor into the parcel. This will not affect the
	// semantics of the smart file descriptor. A new descriptor will be
	// created, and will be closed when the parcel is destroyed.
	status_t writeUniqueFileDescriptor(
	const android::base::unique_fd& fd);

	// Place a vector of file desciptors into the parcel. Each descriptor is
	// dup'd as in writeDupFileDescriptor
	status_t writeUniqueFileDescriptorVector(
	const std::vector<android::base::unique_fd>& val);

	// Writes a blob to the parcel.		// Writes a blob to the parcel.
	// If the blob is small, then it is stored in-place, otherwise it is		// If the blob is small, then it is stored in-place, otherwise it is
	// transferred by way of an anonymous shared memory region. Prefer sending		// transferred by way of an anonymous shared memory region. Prefer sending
	@@ -253,15 +241,6 @@ public:
	// in the parcel, which you do not own -- use dup() to get your own copy.		// in the parcel, which you do not own -- use dup() to get your own copy.
	int readFileDescriptor() const;		int readFileDescriptor() const;

	// Retrieve a smart file descriptor from the parcel.
	status_t readUniqueFileDescriptor(
	android::base::unique_fd* val) const;


	// Retrieve a vector of smart file descriptors from the parcel.
	status_t readUniqueFileDescriptorVector(
	std::vector<android::base::unique_fd>* val) const;

	// Reads a blob from the parcel.		// Reads a blob from the parcel.
	// The caller should call release() on the blob after reading its contents.		// The caller should call release() on the blob after reading its contents.
	status_t readBlob(size_t len, ReadableBlob* outBlob) const;		status_t readBlob(size_t len, ReadableBlob* outBlob) const;

libs/binder/Android.mk

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,7 @@ LOCAL_PATH:= $(call my-dir)

	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := libbinder		LOCAL_MODULE := libbinder
	LOCAL_SHARED_LIBRARIES := liblog libcutils libutils libbase		LOCAL_SHARED_LIBRARIES := liblog libcutils libutils

	LOCAL_CLANG := true		LOCAL_CLANG := true
	LOCAL_SANITIZE := integer		LOCAL_SANITIZE := integer
	@@ -58,7 +58,7 @@ include $(BUILD_SHARED_LIBRARY)

	include $(CLEAR_VARS)		include $(CLEAR_VARS)
	LOCAL_MODULE := libbinder		LOCAL_MODULE := libbinder
	LOCAL_STATIC_LIBRARIES += libutils libbase		LOCAL_STATIC_LIBRARIES += libutils
	LOCAL_SRC_FILES := $(sources)		LOCAL_SRC_FILES := $(sources)
	ifneq ($(TARGET_USES_64_BIT_BINDER),true)		ifneq ($(TARGET_USES_64_BIT_BINDER),true)
	ifneq ($(TARGET_IS_64_BIT),true)		ifneq ($(TARGET_IS_64_BIT),true)

libs/binder/Parcel.cpp

+7 −37

Original line number	Original line	Diff line number	Diff line
	@@ -80,8 +80,6 @@ struct small_flat_data

	namespace android {		namespace android {

	using android::base::unique_fd;

	static pthread_mutex_t gParcelGlobalAllocSizeLock = PTHREAD_MUTEX_INITIALIZER;		static pthread_mutex_t gParcelGlobalAllocSizeLock = PTHREAD_MUTEX_INITIALIZER;
	static size_t gParcelGlobalAllocSize = 0;		static size_t gParcelGlobalAllocSize = 0;
	static size_t gParcelGlobalAllocCount = 0;		static size_t gParcelGlobalAllocCount = 0;
	@@ -1047,20 +1045,12 @@ status_t Parcel::writeDupFileDescriptor(int fd)
	return -errno;		return -errno;
	}		}
	status_t err = writeFileDescriptor(dupFd, true /takeOwnership/);		status_t err = writeFileDescriptor(dupFd, true /takeOwnership/);
	if (err != OK) {		if (err) {
	close(dupFd);		close(dupFd);
	}		}
	return err;		return err;
	}		}

	status_t Parcel::writeUniqueFileDescriptor(const unique_fd& fd) {
	return writeDupFileDescriptor(fd.get());
	}

	status_t Parcel::writeUniqueFileDescriptorVector(const std::vector<unique_fd>& val) {
	return writeTypedVector(val, this, &Parcel::writeUniqueFileDescriptor);
	}

	status_t Parcel::writeBlob(size_t len, bool mutableCopy, WritableBlob* outBlob)		status_t Parcel::writeBlob(size_t len, bool mutableCopy, WritableBlob* outBlob)
	{		{
	if (len > INT32_MAX) {		if (len > INT32_MAX) {
	@@ -1664,36 +1654,16 @@ native_handle* Parcel::readNativeHandle() const
	int Parcel::readFileDescriptor() const		int Parcel::readFileDescriptor() const
	{		{
	const flat_binder_object* flat = readObject(true);		const flat_binder_object* flat = readObject(true);
			if (flat) {
	if (flat && flat->type == BINDER_TYPE_FD) {		switch (flat->type) {
			case BINDER_TYPE_FD:
			//ALOGI("Returning file descriptor %ld from parcel %p", flat->handle, this);
	return flat->handle;		return flat->handle;
	}		}

	return BAD_TYPE;
	}		}

	status_t Parcel::readUniqueFileDescriptor(unique_fd* val) const
	{
	int got = readFileDescriptor();

	if (got == BAD_TYPE) {
	return BAD_TYPE;		return BAD_TYPE;
	}		}

	val->reset(dup(got));

	if (val->get() < 0) {
	return BAD_VALUE;
	}

	return OK;
	}


	status_t Parcel::readUniqueFileDescriptorVector(std::vector<unique_fd>* val) const {
	return readTypedVector(val, this, &Parcel::readUniqueFileDescriptor);
	}

	status_t Parcel::readBlob(size_t len, ReadableBlob* outBlob) const		status_t Parcel::readBlob(size_t len, ReadableBlob* outBlob) const
	{		{
	int32_t blobType;		int32_t blobType;