Merge "Correct "introduced" version for inline API." into main

Treehugger Robot · Gerrit Code Review · commit 1c0f7af81702 · 2024-10-28T23:17:06.000Z
diff --git a/libs/nativewindow/include/android/native_window.h b/libs/nativewindow/include/android/native_window.h
@@ -366,14 +366,13 @@ int32_t ANativeWindow_setFrameRateWithChangeStrategy(ANativeWindow* window, floa
  *
  * See ANativeWindow_setFrameRateWithChangeStrategy().
  *
- * Available since API level 34.
+ * Available since API level 31.
  *
  * \param window pointer to an ANativeWindow object.
  *
  * \return 0 for success, -EINVAL if the window value is invalid.
  */
-inline int32_t ANativeWindow_clearFrameRate(ANativeWindow* window)
-        __INTRODUCED_IN(__ANDROID_API_U__) {
+inline int32_t ANativeWindow_clearFrameRate(ANativeWindow* window) __INTRODUCED_IN(31) {
     return ANativeWindow_setFrameRateWithChangeStrategy(window, 0,
             ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT,
             ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);

Original file line number	Diff line number	Diff line change
`@@ -366,14 +366,13 @@ int32_t ANativeWindow_setFrameRateWithChangeStrategy(ANativeWindow* window, floa`
`366`	`366`	`*`
`367`	`367`	`* See ANativeWindow_setFrameRateWithChangeStrategy().`
`368`	`368`	`*`
`369`		`- * Available since API level 34.`
	`369`	`+ * Available since API level 31.`
`370`	`370`	`*`
`371`	`371`	`* \param window pointer to an ANativeWindow object.`
`372`	`372`	`*`
`373`	`373`	`* \return 0 for success, -EINVAL if the window value is invalid.`
`374`	`374`	`*/`
`375`		`-inline int32_t ANativeWindow_clearFrameRate(ANativeWindow* window)`
`376`		`- __INTRODUCED_IN(__ANDROID_API_U__) {`
	`375`	`+inline int32_t ANativeWindow_clearFrameRate(ANativeWindow* window) __INTRODUCED_IN(31) {`
`377`	`376`	`return ANativeWindow_setFrameRateWithChangeStrategy(window, 0,`
`378`	`377`	`ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT,`
`379`	`378`	`ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);`