commit 7ed019e03cc22287516976c10d3303ce4522e544
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Oct 28 23:57:02 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Oct 28 23:57:02 2024 +0000
tree 73a6ce9297bc5a8f2aafa68b08a0ae673f6fb1e5
parent 2abcfd90f4e71280207211b29cbd0c4eca563445
parent 9e1353fa119920147455be9abb0fe34a43e02072

Merge "Correct "introduced" version for inline API." into main am: 1c0f7af817 am: 9e1353fa11

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>

libs/nativewindow/include/android/native_window.h

diff --git a/libs/nativewindow/include/android/native_window.h b/libs/nativewindow/include/android/native_window.h
index c53d11e..bd8d67a 100644
--- a/libs/nativewindow/include/android/native_window.h
+++ b/libs/nativewindow/include/android/native_window.h
@@ -436,14 +436,13 @@
  *
  * 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);