Merge "Remove __INTRODUCED_IN_LLNDK uses." into main (9adcb25e) · Commits · e / os / android_frameworks_native

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

+44 −65

Original line number	Diff line number	Diff line
		@@ -17,13 +17,6 @@
		#pragma once

		#include <android/binder_parcel.h>
		#if defined(__ANDROID_VENDOR__)
		#include <android/llndk-versioning.h>
		#else
		#if !defined(__INTRODUCED_IN_LLNDK)
		#define __INTRODUCED_IN_LLNDK(level) __attribute__((annotate("introduced_in_llndk=" #level)))
		#endif
		#endif // __ANDROID_VENDOR__
		#include <stdbool.h>
		#include <stdint.h>
		#include <sys/cdefs.h>
		@@ -83,8 +76,7 @@ typedef char* _Nullable (*_Nonnull APersistableBundle_stringAllocator)(int32_t s
		*
		* \return Pointer to a new APersistableBundle
		*/
		APersistableBundle* _Nullable APersistableBundle_new() __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		APersistableBundle* _Nullable APersistableBundle_new() __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Create a new APersistableBundle based off an existing APersistableBundle.
		@@ -98,7 +90,7 @@ APersistableBundle* _Nullable APersistableBundle_new() __INTRODUCED_IN(__ANDROID
		* \return Pointer to a new APersistableBundle
		*/
		APersistableBundle* _Nullable APersistableBundle_dup(const APersistableBundle* _Nonnull pBundle)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Delete an APersistableBundle. This must always be called when finished using
		@@ -109,7 +101,7 @@ APersistableBundle* _Nullable APersistableBundle_dup(const APersistableBundle* _
		* Available since API level 202404.
		*/
		void APersistableBundle_delete(APersistableBundle* _Nullable pBundle)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Check for equality of APersistableBundles.
		@@ -123,7 +115,7 @@ void APersistableBundle_delete(APersistableBundle* _Nullable pBundle)
		*/
		bool APersistableBundle_isEqual(const APersistableBundle* _Nonnull lhs,
		const APersistableBundle* _Nonnull rhs)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Read an APersistableBundle from an AParcel.
		@@ -142,7 +134,7 @@ bool APersistableBundle_isEqual(const APersistableBundle* _Nonnull lhs,
		*/
		binder_status_t APersistableBundle_readFromParcel(
		const AParcel* _Nonnull parcel, APersistableBundle* _Nullable* _Nonnull outPBundle)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Write an APersistableBundle to an AParcel.
		@@ -162,7 +154,7 @@ binder_status_t APersistableBundle_readFromParcel(
		*/
		binder_status_t APersistableBundle_writeToParcel(const APersistableBundle* _Nonnull pBundle,
		AParcel* _Nonnull parcel)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get the size of an APersistableBundle. This is the number of mappings in the
		@@ -175,7 +167,7 @@ binder_status_t APersistableBundle_writeToParcel(const APersistableBundle* _Nonn
		* \return number of mappings in the object
		*/
		int32_t APersistableBundle_size(const APersistableBundle* _Nonnull pBundle)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Erase any entries added with the provided key.
		@@ -188,7 +180,7 @@ int32_t APersistableBundle_size(const APersistableBundle* _Nonnull pBundle)
		* \return number of entries erased. Either 0 or 1.
		*/
		int32_t APersistableBundle_erase(APersistableBundle* _Nonnull pBundle, const char* _Nonnull key)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put a boolean associated with the provided key.
		@@ -201,8 +193,7 @@ int32_t APersistableBundle_erase(APersistableBundle* _Nonnull pBundle, const cha
		* Available since API level 202404.
		*/
		void APersistableBundle_putBoolean(APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		bool val) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		bool val) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put an int32_t associated with the provided key.
		@@ -215,8 +206,7 @@ void APersistableBundle_putBoolean(APersistableBundle* _Nonnull pBundle, const c
		* Available since API level 202404.
		*/
		void APersistableBundle_putInt(APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		int32_t val) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int32_t val) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put an int64_t associated with the provided key.
		@@ -229,8 +219,7 @@ void APersistableBundle_putInt(APersistableBundle* _Nonnull pBundle, const char*
		* Available since API level 202404.
		*/
		void APersistableBundle_putLong(APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		int64_t val) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int64_t val) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put a double associated with the provided key.
		@@ -243,8 +232,7 @@ void APersistableBundle_putLong(APersistableBundle* _Nonnull pBundle, const char
		* Available since API level 202404.
		*/
		void APersistableBundle_putDouble(APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		double val) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		double val) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put a string associated with the provided key.
		@@ -258,8 +246,7 @@ void APersistableBundle_putDouble(APersistableBundle* _Nonnull pBundle, const ch
		* Available since API level 202404.
		*/
		void APersistableBundle_putString(APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		const char* _Nonnull val) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		const char* _Nonnull val) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put a boolean vector associated with the provided key.
		@@ -275,8 +262,7 @@ void APersistableBundle_putString(APersistableBundle* _Nonnull pBundle, const ch
		*/
		void APersistableBundle_putBooleanVector(APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, const bool* _Nonnull vec,
		int32_t num) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int32_t num) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put an int32_t vector associated with the provided key.
		@@ -292,7 +278,7 @@ void APersistableBundle_putBooleanVector(APersistableBundle* _Nonnull pBundle,
		*/
		void APersistableBundle_putIntVector(APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		const int32_t* _Nonnull vec, int32_t num)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put an int64_t vector associated with the provided key.
		@@ -308,8 +294,7 @@ void APersistableBundle_putIntVector(APersistableBundle* _Nonnull pBundle, const
		*/
		void APersistableBundle_putLongVector(APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, const int64_t* _Nonnull vec,
		int32_t num) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int32_t num) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put a double vector associated with the provided key.
		@@ -325,8 +310,7 @@ void APersistableBundle_putLongVector(APersistableBundle* _Nonnull pBundle,
		*/
		void APersistableBundle_putDoubleVector(APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, const double* _Nonnull vec,
		int32_t num) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int32_t num) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put a string vector associated with the provided key.
		@@ -343,7 +327,7 @@ void APersistableBundle_putDoubleVector(APersistableBundle* _Nonnull pBundle,
		void APersistableBundle_putStringVector(APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key,
		const char* _Nullable const* _Nullable vec, int32_t num)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Put an APersistableBundle associated with the provided key.
		@@ -359,7 +343,7 @@ void APersistableBundle_putStringVector(APersistableBundle* _Nonnull pBundle,
		void APersistableBundle_putPersistableBundle(APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key,
		const APersistableBundle* _Nonnull val)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get a boolean associated with the provided key.
		@@ -374,7 +358,7 @@ void APersistableBundle_putPersistableBundle(APersistableBundle* _Nonnull pBundl
		*/
		bool APersistableBundle_getBoolean(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, bool* _Nonnull val)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get an int32_t associated with the provided key.
		@@ -388,8 +372,7 @@ bool APersistableBundle_getBoolean(const APersistableBundle* _Nonnull pBundle,
		* \return true if a value exists for the provided key
		*/
		bool APersistableBundle_getInt(const APersistableBundle* _Nonnull pBundle, const char* _Nonnull key,
		int32_t* _Nonnull val) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int32_t* _Nonnull val) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get an int64_t associated with the provided key.
		@@ -404,7 +387,7 @@ bool APersistableBundle_getInt(const APersistableBundle* _Nonnull pBundle, const
		*/
		bool APersistableBundle_getLong(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, int64_t* _Nonnull val)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get a double associated with the provided key.
		@@ -419,7 +402,7 @@ bool APersistableBundle_getLong(const APersistableBundle* _Nonnull pBundle,
		*/
		bool APersistableBundle_getDouble(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, double* _Nonnull val)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get a string associated with the provided key.
		@@ -440,8 +423,7 @@ bool APersistableBundle_getDouble(const APersistableBundle* _Nonnull pBundle,
		int32_t APersistableBundle_getString(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, char* _Nullable* _Nonnull val,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get a boolean vector associated with the provided key and place it in the
		@@ -468,7 +450,7 @@ int32_t APersistableBundle_getString(const APersistableBundle* _Nonnull pBundle,
		int32_t APersistableBundle_getBooleanVector(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, bool* _Nullable buffer,
		int32_t bufferSizeBytes)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get an int32_t vector associated with the provided key and place it in the
		@@ -494,8 +476,7 @@ int32_t APersistableBundle_getBooleanVector(const APersistableBundle* _Nonnull p
		*/
		int32_t APersistableBundle_getIntVector(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, int32_t* _Nullable buffer,
		int32_t bufferSizeBytes) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int32_t bufferSizeBytes) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get an int64_t vector associated with the provided key and place it in the
		@@ -521,8 +502,8 @@ int32_t APersistableBundle_getIntVector(const APersistableBundle* _Nonnull pBund
		*/
		int32_t APersistableBundle_getLongVector(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, int64_t* _Nullable buffer,
		int32_t bufferSizeBytes) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int32_t bufferSizeBytes)
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get a double vector associated with the provided key and place it in the
		@@ -549,7 +530,7 @@ int32_t APersistableBundle_getLongVector(const APersistableBundle* _Nonnull pBun
		int32_t APersistableBundle_getDoubleVector(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key, double* _Nullable buffer,
		int32_t bufferSizeBytes)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get a string vector associated with the provided key and place it in the
		@@ -586,7 +567,7 @@ int32_t APersistableBundle_getStringVector(const APersistableBundle* _Nonnull pB
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get an APersistableBundle* associated with the provided key.
		@@ -605,7 +586,7 @@ int32_t APersistableBundle_getStringVector(const APersistableBundle* _Nonnull pB
		bool APersistableBundle_getPersistableBundle(const APersistableBundle* _Nonnull pBundle,
		const char* _Nonnull key,
		APersistableBundle* _Nullable* _Nonnull outBundle)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -638,7 +619,7 @@ int32_t APersistableBundle_getBooleanKeys(const APersistableBundle* _Nonnull pBu
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -669,8 +650,7 @@ int32_t APersistableBundle_getBooleanKeys(const APersistableBundle* _Nonnull pBu
		int32_t APersistableBundle_getIntKeys(const APersistableBundle* _Nonnull pBundle,
		char* _Nullable* _Nullable outKeys, int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -701,8 +681,7 @@ int32_t APersistableBundle_getIntKeys(const APersistableBundle* _Nonnull pBundle
		int32_t APersistableBundle_getLongKeys(const APersistableBundle* _Nonnull pBundle,
		char* _Nullable* _Nullable outKeys, int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -734,8 +713,8 @@ int32_t APersistableBundle_getDoubleKeys(const APersistableBundle* _Nonnull pBun
		char* _Nullable* _Nullable outKeys,
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -767,8 +746,8 @@ int32_t APersistableBundle_getStringKeys(const APersistableBundle* _Nonnull pBun
		char* _Nullable* _Nullable outKeys,
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -801,7 +780,7 @@ int32_t APersistableBundle_getBooleanVectorKeys(const APersistableBundle* _Nonnu
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -834,7 +813,7 @@ int32_t APersistableBundle_getIntVectorKeys(const APersistableBundle* _Nonnull p
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -867,7 +846,7 @@ int32_t APersistableBundle_getLongVectorKeys(const APersistableBundle* _Nonnull
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -899,7 +878,7 @@ int32_t APersistableBundle_getDoubleVectorKeys(const APersistableBundle* _Nonnul
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -932,7 +911,7 @@ int32_t APersistableBundle_getStringVectorKeys(const APersistableBundle* _Nonnul
		int32_t bufferSizeBytes,
		APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context)
		__INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		__INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Get all of the keys associated with this specific type and place it in the
		@@ -963,6 +942,6 @@ int32_t APersistableBundle_getStringVectorKeys(const APersistableBundle* _Nonnul
		int32_t APersistableBundle_getPersistableBundleKeys(
		const APersistableBundle* _Nonnull pBundle, char* _Nullable* _Nullable outKeys,
		int32_t bufferSizeBytes, APersistableBundle_stringAllocator stringAllocator,
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__) __INTRODUCED_IN_LLNDK(202404);
		void* _Nullable context) __INTRODUCED_IN(__ANDROID_API_V__);

		__END_DECLS

libs/binder/ndk/include_platform/android/binder_manager.h

+1 −2

Original line number	Diff line number	Diff line
		@@ -257,8 +257,7 @@ void AServiceManager_getUpdatableApexName(const char* instance, void* context,
		* \return the result of dlopen of the specified HAL
		*/
		void* AServiceManager_openDeclaredPassthroughHal(const char* interface, const char* instance,
		int flag) __INTRODUCED_IN(__ANDROID_API_V__)
		__INTRODUCED_IN_LLNDK(202404);
		int flag) __INTRODUCED_IN(__ANDROID_API_V__);

		/**
		* Prevent lazy services without client from shutting down their process