Merge "Correct "introduced" version for inline API." into main am: 1c0f7af am: 9e1353f

Treehugger Robot · android-build-merge-worker-robot · commit 7ed019e03cc2 · 2024-10-28T23:57:02.000Z
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3302719 Change-Id: Iaed2bd41c0163b396f68d06fe54c3cd426e3a292 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libs/nativewindow/include/android/native_window.h b/libs/nativewindow/include/android/native_window.h
@@ -436,14 +436,13 @@ int32_t ANativeWindow_setFrameRateParams(
  *
  * 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
`@@ -436,14 +436,13 @@ int32_t ANativeWindow_setFrameRateParams(`
`436`	`436`	`*`
`437`	`437`	`* See ANativeWindow_setFrameRateWithChangeStrategy().`
`438`	`438`	`*`
`439`		`- * Available since API level 34.`
	`439`	`+ * Available since API level 31.`
`440`	`440`	`*`
`441`	`441`	`* \param window pointer to an ANativeWindow object.`
`442`	`442`	`*`
`443`	`443`	`* \return 0 for success, -EINVAL if the window value is invalid.`
`444`	`444`	`*/`
`445`		`-inline int32_t ANativeWindow_clearFrameRate(ANativeWindow* window)`
`446`		`- __INTRODUCED_IN(__ANDROID_API_U__) {`
	`445`	`+inline int32_t ANativeWindow_clearFrameRate(ANativeWindow* window) __INTRODUCED_IN(31) {`
`447`	`446`	`return ANativeWindow_setFrameRateWithChangeStrategy(window, 0,`
`448`	`447`	`ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT,`
`449`	`448`	`ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);`