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

Commit 9789e55a authored by Peiyong Lin's avatar Peiyong Lin Committed by Android (Google) Code Review
Browse files

Merge "Add HDR_10_PLUS to HdrCapabilities."

parents af102b97 173ae08d

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -48541,6 +48541,7 @@ package android.view { 
    field public static final android.os.Parcelable.Creator<android.view.Display.HdrCapabilities> CREATOR;

    field public static final int HDR_TYPE_DOLBY_VISION = 1; // 0x1

    field public static final int HDR_TYPE_HDR10 = 2; // 0x2

    field public static final int HDR_TYPE_HDR10_PLUS = 4; // 0x4

    field public static final int HDR_TYPE_HLG = 3; // 0x3

    field public static final float INVALID_LUMINANCE = -1.0f;

  }

core/java/android/view/Display.java

+6 −0
Original line number Diff line number Diff line
@@ -1391,11 +1391,17 @@ public final class Display { 
         */

        public static final int HDR_TYPE_HLG = 3;



        /**

         * HDR10+ display.

         */

        public static final int HDR_TYPE_HDR10_PLUS = 4;



        /** @hide */

        @IntDef(prefix = { "HDR_TYPE_" }, value = {

                HDR_TYPE_DOLBY_VISION,

                HDR_TYPE_HDR10,

                HDR_TYPE_HLG,

                HDR_TYPE_HDR10_PLUS,

        })

        @Retention(RetentionPolicy.SOURCE)

        public @interface HdrType {}