Snap for 7239224 from df537ed60193430aa9d8451be828060d23b28b63 to sc-release (b8899277) · Commits · e / os / android_frameworks_native

libs/binder/Debug.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -37,8 +37,7 @@ void printHexData(int32_t indent, const void *buf, size_t length,
		size_t alignment=0, bool cArrayStyle=false,
		debugPrintFunc func = nullptr, void* cookie = nullptr);


		ssize_t getBinderKernelReferences(size_t count, uintptr_t* buf);
		extern "C" ssize_t getBinderKernelReferences(size_t count, uintptr_t* buf);

		// ---------------------------------------------------------------------------
		} // namespace android

+3 −0

Original line number	Diff line number	Diff line
		@@ -42,6 +42,9 @@
		{
		"name": "aidl_integration_test"
		},
		{
		"name": "memunreachable_binder_test"
		},
		{
		"name": "libbinderthreadstateutils_test"
		},

+0 −5

Original line number	Diff line number	Diff line
		@@ -36,11 +36,6 @@

		__BEGIN_DECLS

		#ifndef __ANDROID_API__
		#error Android builds must be compiled against a specific API. If this is an \
		android platform host build, you must use libbinder_ndk_host_user.
		#endif

		typedef uint32_t binder_flags_t;
		enum {
		/**

+16 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,16 @@

		__BEGIN_DECLS

		#ifndef __ANDROID_API__
		#error Android builds must be compiled against a specific API. If this is an \
		android platform host build, you must use libbinder_ndk_host_user.
		#endif

		/**
		* Low-level status types for use in binder. This is the least preferable way to
		* return an error for binder services (where binder_exception_t should be used,
		* particularly EX_SERVICE_SPECIFIC).
		*/
		enum {
		STATUS_OK = 0,

		@@ -62,6 +72,10 @@ enum {
		*/
		typedef int32_t binder_status_t;

		/**
		* Top level exceptions types for Android binder errors, mapping to Java
		* exceptions. Also see Parcel.java.
		*/
		enum {
		EX_NONE = 0,
		EX_SECURITY = -1,
		@@ -170,7 +184,8 @@ __attribute__((warn_unused_result)) AStatus* AStatus_fromServiceSpecificErrorWit
		/**
		* New status with binder_status_t. This is typically for low level failures when a binder_status_t
		* is returned by an API on AIBinder or AParcel, and that is to be returned from a method returning
		* an AStatus instance.
		* an AStatus instance. This is the least preferable way to return errors.
		* Prefer exceptions (particularly service-specific errors) when possible.
		*
		* Available since API level 29.
		*

+5 −3

Original line number	Diff line number	Diff line
		@@ -20,9 +20,7 @@

		__BEGIN_DECLS

		#if defined(__ANDROID_APEX__) \|\| defined(__ANDROID_VNDK__)
		#error this is only for platform code
		#endif
		#if !defined(__ANDROID_APEX__) && !defined(__ANDROID_VNDK__)

		/**
		* Gets whether or not FDs are allowed by this AParcel
		@@ -33,6 +31,9 @@ __BEGIN_DECLS
		*/
		bool AParcel_getAllowFds(const AParcel*);

		#endif

		#if !defined(__ANDROID_APEX__)
		/**
		* Data written to the parcel will be zero'd before being deleted or realloced.
		*
		@@ -43,5 +44,6 @@ bool AParcel_getAllowFds(const AParcel*);
		* \param parcel The parcel to clear associated data from.
		*/
		void AParcel_markSensitive(const AParcel* parcel);
		#endif

		__END_DECLS