diff options
| author | 2022-12-02 14:00:08 +0100 | |
|---|---|---|
| committer | 2022-12-02 14:00:08 +0100 | |
| commit | 69df5c022b9e212985179b588da3d2cb2fc74262 (patch) | |
| tree | 41a4fb8001145e714e1b0e795b7d89a76cc39f1b | |
| parent | 2fdbd6c634209e28c72c82726bae10b980019d10 (diff) | |
Inlining the clearFrameRate function.
Bug: 246597190
Test: m
Change-Id: Ia11f47de9b52ecfc41119fcf2605b5ac56b07275
| -rw-r--r-- | libs/nativewindow/ANativeWindow.cpp | 9 | ||||
| -rw-r--r-- | libs/nativewindow/include/android/native_window.h | 8 | ||||
| -rw-r--r-- | libs/nativewindow/libnativewindow.map.txt | 1 |
3 files changed, 6 insertions, 12 deletions
diff --git a/libs/nativewindow/ANativeWindow.cpp b/libs/nativewindow/ANativeWindow.cpp index c345385839..b7b2926c73 100644 --- a/libs/nativewindow/ANativeWindow.cpp +++ b/libs/nativewindow/ANativeWindow.cpp @@ -232,15 +232,6 @@ int32_t ANativeWindow_setFrameRateWithChangeStrategy(ANativeWindow* window, floa return native_window_set_frame_rate(window, frameRate, compatibility, changeFrameRateStrategy); } -int32_t ANativeWindow_clearFrameRate(ANativeWindow* window) { - if (!window || !query(window, NATIVE_WINDOW_IS_VALID)) { - return -EINVAL; - } - return native_window_set_frame_rate(window, 0, - ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT, - ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS); -} - /************************************************************************************************** * vndk-stable **************************************************************************************************/ diff --git a/libs/nativewindow/include/android/native_window.h b/libs/nativewindow/include/android/native_window.h index a27e3dd503..be6623ee75 100644 --- a/libs/nativewindow/include/android/native_window.h +++ b/libs/nativewindow/include/android/native_window.h @@ -372,8 +372,12 @@ int32_t ANativeWindow_setFrameRateWithChangeStrategy(ANativeWindow* window, floa * * \return 0 for success, -EINVAL if the window value is invalid. */ -int32_t ANativeWindow_clearFrameRate(ANativeWindow* window) - __INTRODUCED_IN(__ANDROID_API_U__); +inline int32_t ANativeWindow_clearFrameRate(ANativeWindow* window) + __INTRODUCED_IN(__ANDROID_API_U__) { + return ANativeWindow_setFrameRateWithChangeStrategy(window, 0, + ANATIVEWINDOW_FRAME_RATE_COMPATIBILITY_DEFAULT, + ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS); +} #ifdef __cplusplus } diff --git a/libs/nativewindow/libnativewindow.map.txt b/libs/nativewindow/libnativewindow.map.txt index 76d23fab1d..63fdcc9205 100644 --- a/libs/nativewindow/libnativewindow.map.txt +++ b/libs/nativewindow/libnativewindow.map.txt @@ -51,7 +51,6 @@ LIBNATIVEWINDOW { ANativeWindow_setDequeueTimeout; # systemapi # introduced=30 ANativeWindow_setFrameRate; # introduced=30 ANativeWindow_setFrameRateWithChangeStrategy; # introduced=31 - ANativeWindow_clearFrameRate; # introduced=UpsideDownCake ANativeWindow_setSharedBufferMode; # llndk ANativeWindow_setSwapInterval; # llndk ANativeWindow_setUsage; # llndk |