Merge "Remove __ANDROID_API__ #if checks." (db3bb21b) · Commits · e / os / android_frameworks_native-old

libs/binder/ndk/include_ndk/android/binder_ibinder.h

+0 −12

Original line number	Diff line number	Diff line
		@@ -41,8 +41,6 @@ __BEGIN_DECLS
		android platform host build, you must use libbinder_ndk_host_user.
		#endif

		#if __ANDROID_API__ >= 29

		typedef uint32_t binder_flags_t;
		enum {
		/**
		@@ -567,10 +565,6 @@ __attribute__((warn_unused_result)) AIBinder_DeathRecipient* AIBinder_DeathRecip
		*/
		void AIBinder_DeathRecipient_delete(AIBinder_DeathRecipient* recipient) __INTRODUCED_IN(29);

		#endif //__ANDROID_API__ >= 29

		#if __ANDROID_API__ >= 30

		/**
		* Gets the extension registered with AIBinder_setExtension.
		*
		@@ -640,10 +634,6 @@ binder_status_t AIBinder_getExtension(AIBinder* binder, AIBinder** outExt) __INT
		*/
		binder_status_t AIBinder_setExtension(AIBinder* binder, AIBinder* ext) __INTRODUCED_IN(30);

		#endif //__ANDROID_API__ >= 30

		#if __ANDROID_API__ >= 31

		/**
		* Retrieve the class descriptor for the class.
		*
		@@ -728,8 +718,6 @@ AIBinder_Weak* AIBinder_Weak_clone(const AIBinder_Weak* weak);
		*/
		bool AIBinder_Weak_lt(const AIBinder_Weak* lhs, const AIBinder_Weak* rhs);

		#endif //__ANDROID_API__ >= 31

		__END_DECLS

		/** @} */

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@
		#include <jni.h>

		__BEGIN_DECLS
		#if __ANDROID_API__ >= 29

		/**
		* Converts an android.os.IBinder object into an AIBinder* object.
		@@ -67,7 +66,6 @@ __attribute__((warn_unused_result)) AIBinder* AIBinder_fromJavaBinder(JNIEnv* en
		__attribute__((warn_unused_result)) jobject AIBinder_toJavaBinder(JNIEnv* env, AIBinder* binder)
		__INTRODUCED_IN(29);

		#endif //__ANDROID_API__ >= 29
		__END_DECLS

		/** @} */

+0 −2

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@ struct AIBinder;
		typedef struct AIBinder AIBinder;

		__BEGIN_DECLS
		#if __ANDROID_API__ >= 29

		/**
		* This object represents a package of data that can be sent between processes. When transacting, an
		@@ -1119,7 +1118,6 @@ binder_status_t AParcel_readByteArray(const AParcel* parcel, void* arrayData,

		// @END-PRIMITIVE-READ-WRITE

		#endif //__ANDROID_API__ >= 29
		/**
		* Reset the parcel to the initial status.
		*

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@
		#include <jni.h>

		__BEGIN_DECLS
		#if __ANDROID_API__ >= 30

		/**
		* Converts an android.os.Parcel object into an AParcel* object.
		@@ -50,7 +49,6 @@ __BEGIN_DECLS
		__attribute__((warn_unused_result)) AParcel* AParcel_fromJavaParcel(JNIEnv* env, jobject parcel)
		__INTRODUCED_IN(30);

		#endif //__ANDROID_API__ >= 30
		__END_DECLS

		/** @} */

+0 −2

Original line number	Diff line number	Diff line
		@@ -31,7 +31,6 @@
		#include <sys/cdefs.h>

		__BEGIN_DECLS
		#if __ANDROID_API__ >= 29

		enum {
		STATUS_OK = 0,
		@@ -275,7 +274,6 @@ void AStatus_deleteDescription(const char* description) __INTRODUCED_IN(30);
		*/
		void AStatus_delete(AStatus* status) __INTRODUCED_IN(29);

		#endif //__ANDROID_API__ >= 29
		__END_DECLS

		/** @} */