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

Commit f3d1ce01 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clarify frame rate as frames per second"

parents 5d2d5718 add6be19
Loading
Loading
Loading
Loading
+6 −5
Original line number Original line Diff line number Diff line
@@ -858,11 +858,12 @@ public class Surface implements Parcelable {
     * surface is consumed by something other than the system compositor, e.g. a media
     * surface is consumed by something other than the system compositor, e.g. a media
     * codec, this call has no effect.
     * codec, this call has no effect.
     *
     *
     * @param frameRate The intended frame rate of this surface. 0 is a special value that
     * @param frameRate The intended frame rate of this surface, in frames per second. 0
     * indicates the app will accept the system's choice for the display frame rate, which
     * is a special value that indicates the app will accept the system's choice for the
     * is the default behavior if this function isn't called. The frameRate param does
     * display frame rate, which is the default behavior if this function isn't
     * *not* need to be a valid refresh rate for this device's display - e.g., it's fine
     * called. The frameRate param does *not* need to be a valid refresh rate for this
     * to pass 30fps to a device that can only run the display at 60fps.
     * device's display - e.g., it's fine to pass 30fps to a device that can only run the
     * display at 60fps.
     */
     */
    public void setFrameRate(@FloatRange(from = 0.0) float frameRate) {
    public void setFrameRate(@FloatRange(from = 0.0) float frameRate) {
        int error = nativeSetFrameRate(mNativeObject, frameRate);
        int error = nativeSetFrameRate(mNativeObject, frameRate);
+6 −6
Original line number Original line Diff line number Diff line
@@ -2801,12 +2801,12 @@ public final class SurfaceControl implements Parcelable {
         * the system releases buffers back to the application.
         * the system releases buffers back to the application.
         *
         *
         * @param sc The SurfaceControl to specify the frame rate of.
         * @param sc The SurfaceControl to specify the frame rate of.
         * @param frameRate The intended frame rate for this surface. 0 is a special value that
         * @param frameRate The intended frame rate for this surface, in frames per second. 0 is a
         *                  indicates the app will accept the system's choice for the display frame
         *                  special value that indicates the app will accept the system's choice for
         *                  rate, which is the default behavior if this function isn't called. The
         *                  the display frame rate, which is the default behavior if this function
         *                  frameRate param does *not* need to be a valid refresh rate for this
         *                  isn't called. The frameRate param does *not* need to be a valid refresh
         *                  device's display - e.g., it's fine to pass 30fps to a device that can
         *                  rate for this device's display - e.g., it's fine to pass 30fps to a
         *                  only run the display at 60fps.
         *                  device that can only run the display at 60fps.
         * @return This transaction object.
         * @return This transaction object.
         */
         */
        @NonNull
        @NonNull