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

Commit f9a1f90f authored Sep 08, 2021 by Treehugger Robot Committed by Automerger Merge Worker Sep 08, 2021

Merge "libbinder_ndk: use API level 33 for new APIs" am: 4f94e0a6 am: 8da01f9d

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

Change-Id: Ie691b4912f4de75bc49b89311f362df5204c0b5e

parents 9bd29def 8da01f9d

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -227,11 +227,11 @@ void AIBinder_Class_setOnDump(AIBinder_Class* clazz, AIBinder_onDump onDump) __I
	* must have a separate way of determining the binder you are talking to is the right type. Must		* must have a separate way of determining the binder you are talking to is the right type. Must
	* be called before any instance of the class is created.		* be called before any instance of the class is created.
	*		*
	* Available since API level 32.		* Available since API level 33.
	*		*
	* \param clazz class to disable interface header on.		* \param clazz class to disable interface header on.
	*/		*/
	void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz) __INTRODUCED_IN(32);		void AIBinder_Class_disableInterfaceTokenHeader(AIBinder_Class* clazz) __INTRODUCED_IN(33);

	/**		/**
	* Creates a new binder object of the appropriate class.		* Creates a new binder object of the appropriate class.

libs/binder/ndk/libbinder_ndk.map.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,7 @@ LIBBINDER_NDK31 { # introduced=31
	AParcel_reset;		AParcel_reset;
	};		};

	LIBBINDER_NDK32 { # introduced=32		LIBBINDER_NDK33 { # introduced=33
	global:		global:
	AIBinder_Class_disableInterfaceTokenHeader;		AIBinder_Class_disableInterfaceTokenHeader;
	};		};