Merge "Fix ndk native reference documentation link errors/warnings" into sc-dev (80402b93) · Commits · e / os / platform_frameworks_native

include/android/bitmap.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -241,6 +241,7 @@ typedef struct AHardwareBuffer AHardwareBuffer;
		*
		* Available since API level 30.
		*
		* @param env Handle to the JNI environment pointer.
		* @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

+5 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,11 @@
		__BEGIN_DECLS

		struct AChoreographer;
		/**
		* Opaque type that provides access to an AChoreographer object.
		*
		* A pointer can be obtained using {@link AChoreographer_getInstance()}.
		*/
		typedef struct AChoreographer AChoreographer;

		/**

include/android/font.h

+3 −3

Original line number	Diff line number	Diff line
		@@ -189,7 +189,7 @@ const char* _Nonnull AFont_getFontFilePath(const AFont* _Nonnull font) __INTRODU
		* Available since API level 29.
		*
		* \param font a font object. Passing NULL is not allowed.
		* \return a positive integer less than or equal to {@link ASYSTEM_FONT_MAX_WEIGHT} is returned.
		* \return a positive integer less than or equal to {@link AFONT_WEIGHT_MAX} is returned.
		*/
		uint16_t AFont_getWeight(const AFont* _Nonnull font) __INTRODUCED_IN(29);

		@@ -241,7 +241,7 @@ size_t AFont_getCollectionIndex(const AFont* _Nonnull font) __INTRODUCED_IN(29);
		* In this case, AFont_getAxisCount returns 2 and AFont_getAxisTag
		* and AFont_getAxisValue will return following values.
		* \code{.cpp}
		* AFont* font = AFontIterator_next(ite);
		* AFont* font = ASystemFontIterator_next(ite);
		*
		* // Returns the number of axes
		* AFont_getAxisCount(font); // Returns 2
		@@ -289,7 +289,7 @@ uint32_t AFont_getAxisTag(const AFont* _Nonnull font, uint32_t axisIndex)
		*
		* \param font a font object. Passing NULL is not allowed.
		* \param axisIndex an index to the font variation settings. Passing value larger than or
		* equal to {@link ASYstemFont_getAxisCount} is not allwed.
		* equal to {@link AFont_getAxisCount} is not allowed.
		* \return a float value for the given font variation setting.
		*/
		float AFont_getAxisValue(const AFont* _Nonnull font, uint32_t axisIndex)

include/android/font_matcher.h

+7 −7

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@
		* // Simple font query for the ASCII character.
		* std::vector<uint16_t> text = { 'A' };
		* AFontMatcher* matcher = AFontMatcher_create("sans-serif");
		* ASystemFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* AFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* // runLength will be 1 and the font will points a valid font file.
		* AFontMatcher_destroy(matcher);
		*
		@@ -44,17 +44,17 @@
		* std::vector<uint16_t> text = { 0x9AA8 };
		* AFontMatcher* matcher = AFontMatcher_create("sans-serif");
		* AFontMatcher_setLocales(matcher, "zh-CN,ja-JP");
		* ASystemFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* AFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* // runLength will be 1 and the font will points a Simplified Chinese font.
		* AFontMatcher_setLocales(matcher, "ja-JP,zh-CN");
		* ASystemFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* AFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* // runLength will be 1 and the font will points a Japanese font.
		* AFontMatcher_destroy(matcher);
		*
		* // Querying font for text/color emoji
		* std::vector<uint16_t> text = { 0xD83D, 0xDC68, 0x200D, 0x2764, 0xFE0F, 0x200D, 0xD83D, 0xDC68 };
		* AFontMatcher* matcher = AFontMatcher_create("sans-serif");
		* ASystemFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* AFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* // runLength will be 8 and the font will points a color emoji font.
		* AFontMatcher_destroy(matcher);
		*
		@@ -62,7 +62,7 @@
		* // 0x05D0 is a Hebrew character and 0x0E01 is a Thai character.
		* std::vector<uint16_t> text = { 0x05D0, 0x0E01 };
		* AFontMatcher* matcher = AFontMatcher_create("sans-serif");
		* ASystemFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* AFont* font = AFontMatcher_match(text.data(), text.length(), &runLength);
		* // runLength will be 1 and the font will points a Hebrew font.
		* AFontMatcher_destroy(matcher);
		* \endcode
		@@ -146,7 +146,7 @@ void AFontMatcher_destroy(AFontMatcher* _Nonnull matcher) __INTRODUCED_IN(29);
		/**
		* Set font style to matcher.
		*
		* If this function is not called, the matcher performs with {@link ASYSTEM_FONT_WEIGHT_NORMAL}
		* If this function is not called, the matcher performs with {@link AFONT_WEIGHT_NORMAL}
		* with non-italic style.
		*
		* Available since API level 29.
		@@ -206,7 +206,7 @@ void AFontMatcher_setFamilyVariant(
		* \param textLength a length of the given text buffer. This must not be zero.
		* \param runLengthOut if not null, the font run length will be filled.
		* \return a font to be used for given text and params. You need to release the returned font by
		* ASystemFont_close when it is no longer needed.
		* AFont_close when it is no longer needed.
		*/
		AFont* _Nonnull AFontMatcher_match(
		const AFontMatcher* _Nonnull matcher,

libs/nativewindow/include/android/native_window.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,7 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window);
		* For all of these parameters, if 0 is supplied then the window's base
		* value will come back in force.
		*
		* \param window pointer to an ANativeWindow object.
		* \param width width of the buffers in pixels.
		* \param height height of the buffers in pixels.
		* \param format one of the AHardwareBuffer_Format constants.
		@@ -191,6 +192,7 @@ int32_t ANativeWindow_unlockAndPost(ANativeWindow* window);
		*
		* Available since API level 26.
		*
		* \param window pointer to an ANativeWindow object.
		* \param transform combination of {@link ANativeWindowTransform} flags
		* \return 0 for success, or -EINVAL if \p transform is invalid
		*/
		@@ -208,6 +210,7 @@ int32_t ANativeWindow_setBuffersTransform(ANativeWindow* window, int32_t transfo
		*
		* Available since API level 28.
		*
		* \param window pointer to an ANativeWindow object.
		* \param dataSpace data space of all buffers queued after this call.
		* \return 0 for success, -EINVAL if window is invalid or the dataspace is not
		* supported.
		@@ -306,6 +309,8 @@ enum ANativeWindow_ChangeFrameRateStrategy {
		* valid refresh rate for this device's display - e.g., it's fine to pass 30fps
		* to a device that can only run the display at 60fps.
		*
		* \param window pointer to an ANativeWindow object.
		*
		* \param compatibility The frame rate compatibility of this window. The
		* compatibility value may influence the system's choice of display refresh
		* rate. See the ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_* values for more info.