Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4be4b81b authored by Kriti Dang's avatar Kriti Dang Committed by Android (Google) Code Review
Browse files

Merge "Inlining the clearFrameRate function."

parents d57302f9 69df5c02

libs/nativewindow/ANativeWindow.cpp

+0 −9
Original line number Diff line number Diff line
@@ -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

 **************************************************************************************************/

libs/nativewindow/include/android/native_window.h

+6 −2
Original line number Diff line number Diff line
@@ -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

}

libs/nativewindow/libnativewindow.map.txt

+0 −1
Original line number Diff line number Diff line
@@ -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