Merge "API level 30 cleanup." into rvc-dev-plus-aosp (8526cb72) · Commits · e / os / android_frameworks_native-old

include/android/bitmap.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,8 @@ int AndroidBitmap_getInfo(JNIEnv* env, jobject jbitmap,
		* Note that {@link ADataSpace} only exposes a few values. This may return
		* {@link ADATASPACE_UNKNOWN}, even for Named ColorSpaces, if they have no
		* corresponding ADataSpace.
		*
		* Available since API level 30.
		*/
		int32_t AndroidBitmap_getDataSpace(JNIEnv* env, jobject jbitmap) __INTRODUCED_IN(30);

		@@ -189,6 +191,8 @@ enum AndroidBitmapCompressFormat {
		/**
		* User-defined function for writing the output of compression.
		*
		* Available since API level 30.
		*
		* @param userContext Pointer to user-defined data passed to
		* {@link AndroidBitmap_compress}.
		* @param data Compressed data of \|size\| bytes to write.
		@@ -202,6 +206,8 @@ typedef bool (AndroidBitmap_CompressWriteFunc)(void userContext,
		/**
		* Compress \|pixels\| as described by \|info\|.
		*
		* Available since API level 30.
		*
		* @param info Description of the pixels to compress.
		* @param dataspace {@link ADataSpace} describing the color space of the
		* pixels.
		@@ -234,6 +240,8 @@ typedef struct AHardwareBuffer AHardwareBuffer;
		*
		* Client must not modify it while a Bitmap is wrapping it.
		*
		* Available since API level 30.
		*
		* @param bitmap Handle to an android.graphics.Bitmap.
		* @param outBuffer On success, is set to a pointer to the
		* {@link AHardwareBuffer} associated with bitmap. This acquires

include/android/choreographer.h

+8 −2

Original line number	Diff line number	Diff line
		@@ -129,9 +129,12 @@ void AChoreographer_postFrameCallbackDelayed64(AChoreographer* choreographer,
		*
		* This api is thread-safe. Any thread is allowed to register a new refresh
		* rate callback for the choreographer instance.
		*
		* Available since API level 30.
		*/
		void AChoreographer_registerRefreshRateCallback(AChoreographer* choreographer,
		AChoreographer_refreshRateCallback, void* data);
		AChoreographer_refreshRateCallback, void* data)
		__INTRODUCED_IN(30);

		/**
		* Unregisters a callback to be run when the display refresh rate changes, along
		@@ -144,9 +147,12 @@ void AChoreographer_registerRefreshRateCallback(AChoreographer* choreographer,
		* callback and associated data pointer are unregistered, then there is a
		* guarantee that when the unregistration completes that that callback will not
		* be run with the data pointer passed.
		*
		* Available since API level 30.
		*/
		void AChoreographer_unregisterRefreshRateCallback(AChoreographer* choreographer,
		AChoreographer_refreshRateCallback, void* data);
		AChoreographer_refreshRateCallback, void* data)
		__INTRODUCED_IN(30);
		#endif /* __ANDROID_API__ >= 30 */

		__END_DECLS

include/android/imagedecoder.h

+38 −0

Original line number	Diff line number	Diff line
		@@ -133,6 +133,8 @@ typedef struct AImageDecoder AImageDecoder;
		/**
		* Create a new {@link AImageDecoder} from an {@link AAsset}.
		*
		* Available since API level 30.
		*
		* @param asset {@link AAsset} containing encoded image data. Client is still
		* responsible for calling {@link AAsset_close} on it, which may be
		* done after deleting the returned {@link AImageDecoder}.
		@@ -162,6 +164,8 @@ int AImageDecoder_createFromAAsset(struct AAsset* asset, AImageDecoder** outDeco
		/**
		* Create a new {@link AImageDecoder} from a file descriptor.
		*
		* Available since API level 30.
		*
		* @param fd Seekable, readable, open file descriptor for encoded data.
		* Client is still responsible for closing it, which may be done
		* after deleting the returned {@link AImageDecoder}.
		@@ -190,6 +194,8 @@ int AImageDecoder_createFromFd(int fd, AImageDecoder** outDecoder) __INTRODUCED_
		/**
		* Create a new AImageDecoder from a buffer.
		*
		* Available since API level 30.
		*
		* @param buffer Pointer to encoded data. Must be valid for the entire time
		* the {@link AImageDecoder} is used.
		* @param length Byte length of buffer.
		@@ -217,12 +223,16 @@ int AImageDecoder_createFromBuffer(const void* buffer, size_t length,

		/**
		* Delete the AImageDecoder.
		*
		* Available since API level 30.
		*/
		void AImageDecoder_delete(AImageDecoder* decoder) __INTRODUCED_IN(30);

		/**
		* Choose the desired output format.
		*
		* Available since API level 30.
		*
		* @param format {@link AndroidBitmapFormat} to use for the output.
		* @return {@link ANDROID_IMAGE_DECODER_SUCCESS} on success or a value
		* indicating the reason for the failure. On failure, the
		@@ -247,6 +257,8 @@ int AImageDecoder_setAndroidBitmapFormat(AImageDecoder*,
		* Pass true to this method to leave them unpremultiplied. This has no effect on an
		* opaque image.
		*
		* Available since API level 30.
		*
		* @param unpremultipliedRequired Pass true to leave the pixels unpremultiplied.
		* @return {@link ANDROID_IMAGE_DECODER_SUCCESS} on success or a value
		* indicating the reason for the failure.
		@@ -267,6 +279,8 @@ int AImageDecoder_setUnpremultipliedRequired(AImageDecoder*,
		* Ignored by {@link ANDROID_BITMAP_FORMAT_A_8}, which does not support
		* an {@link ADataSpace}.
		*
		* Available since API level 30.
		*
		* @param dataspace The {@link ADataSpace} to decode into. An ADataSpace
		* specifies how to interpret the colors. By default,
		* AImageDecoder will decode into the ADataSpace specified by
		@@ -292,6 +306,8 @@ int AImageDecoder_setDataSpace(AImageDecoder*, int32_t dataspace) __INTRODUCED_I
		* specified by width and height, and the output image will be the size of the
		* crop rect.
		*
		* Available since API level 30.
		*
		* @param width Width of the output (prior to cropping).
		* This will affect future calls to
		* {@link AImageDecoder_getMinimumStride}, which will now return
		@@ -319,6 +335,8 @@ int AImageDecoder_setTargetSize(AImageDecoder*, int32_t width, int32_t height) _
		* others. This computes the most efficient target size to use to reach a
		* particular sampleSize.
		*
		* Available since API level 30.
		*
		* @param sampleSize A subsampling rate of the original image. Must be greater
		* than or equal to 1. A sampleSize of 2 means to skip every
		* other pixel/line, resulting in a width and height that are
		@@ -344,6 +362,8 @@ int AImageDecoder_computeSampledSize(const AImageDecoder*, int sampleSize,
		* the specified {@link ARect}. Clients will only need to allocate enough memory
		* for the cropped ARect.
		*
		* Available since API level 30.
		*
		* @param crop Rectangle describing a crop of the decode. It must be contained inside of
		* the (possibly scaled, by {@link AImageDecoder_setTargetSize})
		* image dimensions. This will affect future calls to
		@@ -376,6 +396,8 @@ typedef struct AImageDecoderHeaderInfo AImageDecoderHeaderInfo;
		*
		* This is owned by the {@link AImageDecoder} and will be destroyed when the
		* AImageDecoder is destroyed via {@link AImageDecoder_delete}.
		*
		* Available since API level 30.
		*/
		const AImageDecoderHeaderInfo* AImageDecoder_getHeaderInfo(
		const AImageDecoder*) __INTRODUCED_IN(30);
		@@ -385,6 +407,8 @@ const AImageDecoderHeaderInfo* AImageDecoder_getHeaderInfo(
		* pixel width of the output, unless {@link AImageDecoder_setTargetSize} is
		* used to choose a different size or {@link AImageDecoder_setCrop} is used to
		* set a crop rect.
		*
		* Available since API level 30.
		*/
		int32_t AImageDecoderHeaderInfo_getWidth(const AImageDecoderHeaderInfo*) __INTRODUCED_IN(30);

		@@ -393,12 +417,16 @@ int32_t AImageDecoderHeaderInfo_getWidth(const AImageDecoderHeaderInfo*) __INTRO
		* pixel height of the output, unless {@link AImageDecoder_setTargetSize} is
		* used to choose a different size or {@link AImageDecoder_setCrop} is used to
		* set a crop rect.
		*
		* Available since API level 30.
		*/
		int32_t AImageDecoderHeaderInfo_getHeight(const AImageDecoderHeaderInfo*) __INTRODUCED_IN(30);

		/**
		* Report the mimeType of the encoded image.
		*
		* Available since API level 30.
		*
		* @return a string literal describing the mime type.
		*/
		const char* AImageDecoderHeaderInfo_getMimeType(
		@@ -409,6 +437,8 @@ const char* AImageDecoderHeaderInfo_getMimeType(
		* by default. {@link AImageDecoder} will try to choose one that is sensible
		* for the image and the system. Note that this does not indicate the
		* encoded format of the image.
		*
		* Available since API level 30.
		*/
		int32_t AImageDecoderHeaderInfo_getAndroidBitmapFormat(
		const AImageDecoderHeaderInfo*) __INTRODUCED_IN(30);
		@@ -419,6 +449,8 @@ int32_t AImageDecoderHeaderInfo_getAndroidBitmapFormat(
		* {@link ANDROID_BITMAP_FLAGS_ALPHA_OPAQUE}. If the image may contain alpha,
		* this returns {@link ANDROID_BITMAP_FLAGS_ALPHA_PREMUL}, because
		* {@link AImageDecoder_decodeImage} will premultiply pixels by default.
		*
		* Available since API level 30.
		*/
		int AImageDecoderHeaderInfo_getAlphaFlags(
		const AImageDecoderHeaderInfo*) __INTRODUCED_IN(30);
		@@ -429,6 +461,8 @@ int AImageDecoderHeaderInfo_getAlphaFlags(
		* By default, {@link AImageDecoder_decodeImage} will not do any color
		* conversion.
		*
		* Available since API level 30.
		*
		* @return The {@link ADataSpace} representing the way the colors
		* are encoded (or {@link ADATASPACE_UNKNOWN} if there is not a
		* corresponding ADataSpace). This specifies how to interpret the colors
		@@ -452,12 +486,16 @@ int32_t AImageDecoderHeaderInfo_getDataSpace(
		*
		* If the output is scaled (via {@link AImageDecoder_setTargetSize}) and/or
		* cropped (via {@link AImageDecoder_setCrop}), this takes those into account.
		*
		* Available since API level 30.
		*/
		size_t AImageDecoder_getMinimumStride(AImageDecoder*) __INTRODUCED_IN(30);

		/**
		* Decode the image into pixels, using the settings of the {@link AImageDecoder}.
		*
		* Available since API level 30.
		*
		* @param decoder Opaque object representing the decoder.
		* @param pixels On success, will be filled with the result
		* of the decode. Must be large enough to hold \|size\| bytes.

include/android/thermal.h

+19 −11

Original line number	Diff line number	Diff line
		@@ -60,8 +60,6 @@
		extern "C" {
		#endif

		#if __ANDROID_API__ >= 30

		enum AThermalStatus {
		/** Error in thermal status. */
		ATHERMAL_STATUS_ERROR = -1,
		@@ -111,36 +109,45 @@ typedef struct AThermalManager AThermalManager;
		*/
		typedef void (AThermal_StatusCallback)(void data, AThermalStatus status);

		#if __ANDROID_API__ >= 30

		/**
		* Acquire an instance of the thermal manager. This must be freed using
		* {@link AThermal_releaseManager}.
		*
		* Available since API level 30.
		*
		* @return manager instance on success, nullptr on failure.
		*/
		AThermalManager* AThermal_acquireManager();
		AThermalManager* AThermal_acquireManager() __INTRODUCED_IN(30);

		/**
		* Release the thermal manager pointer acquired via
		* {@link AThermal_acquireManager}.
		*
		* @param manager The manager to be released.
		* Available since API level 30.
		*
		* @param manager The manager to be released.
		*/
		void AThermal_releaseManager(AThermalManager *manager);
		void AThermal_releaseManager(AThermalManager *manager) __INTRODUCED_IN(30);

		/**
		* Gets the current thermal status.
		*
		* Available since API level 30.
		*
		* @param manager The manager instance to use to query the thermal status.
		* Acquired via {@link AThermal_acquireManager}.
		*
		* @return current thermal status, ATHERMAL_STATUS_ERROR on failure.
		*/
		AThermalStatus AThermal_getCurrentThermalStatus(AThermalManager *manager);
		AThermalStatus AThermal_getCurrentThermalStatus(AThermalManager *manager) __INTRODUCED_IN(30);

		/**
		* Register the thermal status listener for thermal status change.
		*
		* Available since API level 30.
		*
		* @param manager The manager instance to use to register.
		* Acquired via {@link AThermal_acquireManager}.
		* @param callback The callback function to be called when thermal status updated.
		@@ -152,11 +159,13 @@ AThermalStatus AThermal_getCurrentThermalStatus(AThermalManager *manager);
		* EPIPE if communication with the system service has failed.
		*/
		int AThermal_registerThermalStatusListener(AThermalManager *manager,
		AThermal_StatusCallback callback, void *data);
		AThermal_StatusCallback callback, void *data) __INTRODUCED_IN(30);

		/**
		* Unregister the thermal status listener previously resgistered.
		*
		* Available since API level 30.
		*
		* @param manager The manager instance to use to unregister.
		* Acquired via {@link AThermal_acquireManager}.
		* @param callback The callback function to be called when thermal status updated.
		@@ -168,8 +177,7 @@ int AThermal_registerThermalStatusListener(AThermalManager *manager,
		* EPIPE if communication with the system service has failed.
		*/
		int AThermal_unregisterThermalStatusListener(AThermalManager *manager,
		AThermal_StatusCallback callback, void *data);

		AThermal_StatusCallback callback, void *data) __INTRODUCED_IN(30);

		#endif // __ANDROID_API__ >= 30