Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71148066 authored Sep 23, 2021 by Steven Moreland Committed by Automerger Merge Worker Sep 23, 2021

Merge changes I4f475748,I633b634f am: f24415a9 am: 53e7c220 am: cb7bee48 am: fd56d6a6

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

Change-Id: I0e49fc7249f508d0d0404f6df5cb499ba9c5cc80

parents 09bff825 fd56d6a6

libs/binder/Parcel.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -233,7 +233,7 @@ status_t Parcel::flattenBinder(const sp<IBinder>& binder) {
	ALOGE("null proxy");		ALOGE("null proxy");
	} else {		} else {
	if (proxy->isRpcBinder()) {		if (proxy->isRpcBinder()) {
	ALOGE("Sending a socket binder over RPC is prohibited");		ALOGE("Sending a socket binder over kernel binder is prohibited");
	return INVALID_OPERATION;		return INVALID_OPERATION;
	}		}
	}		}

libs/binder/ndk/status.cpp

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@
	#include <android-base/logging.h>		#include <android-base/logging.h>

	using ::android::status_t;		using ::android::status_t;
			using ::android::statusToString;
	using ::android::binder::Status;		using ::android::binder::Status;

	AStatus* AStatus_newOk() {		AStatus* AStatus_newOk() {
	@@ -126,7 +127,7 @@ binder_status_t PruneStatusT(status_t status) {
	return STATUS_UNKNOWN_ERROR;		return STATUS_UNKNOWN_ERROR;

	default:		default:
	LOG(WARNING) << __func__ << ": Unknown status_t (" << status		LOG(WARNING) << __func__ << ": Unknown status_t (" << statusToString(status)
	<< ") pruned into STATUS_UNKNOWN_ERROR";		<< ") pruned into STATUS_UNKNOWN_ERROR";
	return STATUS_UNKNOWN_ERROR;		return STATUS_UNKNOWN_ERROR;
	}		}