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

Commit cf89cad3 authored by Steven Thomas's avatar Steven Thomas Committed by Automerger Merge Worker
Browse files

Merge "Clarify FRAME_RATE_COMPATIBILITY_* params" into rvc-dev am: 061dec3e 

Original change: undetermined

Change-Id: I125d7c28abd8049036c02479ea2a5245689f9caf
parents 070b3684 061dec3e

core/java/android/view/Surface.java

+5 −2
Original line number Diff line number Diff line
@@ -195,7 +195,10 @@ public class Surface implements Parcelable { 


    // From native_window.h. Keep these in sync.

    /**

     * There are no inherent restrictions on the frame rate of this surface.

     * There are no inherent restrictions on the frame rate of this surface. When the

     * system selects a frame rate other than what the app requested, the app will be able

     * to run at the system frame rate without requiring pull down. This value should be

     * used when displaying game content, UIs, and anything that isn't video.

     */

    public static final int FRAME_RATE_COMPATIBILITY_DEFAULT = 0;
@@ -205,7 +208,7 @@ public class Surface implements Parcelable { 
     * other than what the app requested, the app will need to do pull down or use some

     * other technique to adapt to the system's frame rate. The user experience is likely

     * to be worse (e.g. more frame stuttering) than it would be if the system had chosen

     * the app's requested frame rate.

     * the app's requested frame rate. This value should be used for video content.

     */

    public static final int FRAME_RATE_COMPATIBILITY_FIXED_SOURCE = 1;