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

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

Merge "Add prefix to newly introduced IntDef for DEPTH"

parents abd36d7b 0b92887b

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -16845,15 +16845,15 @@ package android.hardware { 
    field public static final int DATASPACE_BT601_625 = 281149440; // 0x10c20000

    field public static final int DATASPACE_BT709 = 281083904; // 0x10c10000

    field public static final int DATASPACE_DCI_P3 = 155844608; // 0x94a0000

    field public static final int DATASPACE_DEPTH = 4096; // 0x1000

    field public static final int DATASPACE_DISPLAY_P3 = 143261696; // 0x88a0000

    field public static final int DATASPACE_DYNAMIC_DEPTH = 4098; // 0x1002

    field public static final int DATASPACE_JFIF = 146931712; // 0x8c20000

    field public static final int DATASPACE_SCRGB = 411107328; // 0x18810000

    field public static final int DATASPACE_SCRGB_LINEAR = 406913024; // 0x18410000

    field public static final int DATASPACE_SRGB = 142671872; // 0x8810000

    field public static final int DATASPACE_SRGB_LINEAR = 138477568; // 0x8410000

    field public static final int DATASPACE_UNKNOWN = 0; // 0x0

    field public static final int DEPTH = 4096; // 0x1000

    field public static final int DYNAMIC_DEPTH = 4098; // 0x1002

    field public static final int RANGE_EXTENDED = 402653184; // 0x18000000

    field public static final int RANGE_FULL = 134217728; // 0x8000000

    field public static final int RANGE_LIMITED = 268435456; // 0x10000000

core/java/android/hardware/DataSpace.java

+4 −4
Original line number Diff line number Diff line
@@ -388,8 +388,8 @@ public final class DataSpace { 
    /** @hide */

    @Retention(RetentionPolicy.SOURCE)

    @IntDef(flag = true, value = {

        DEPTH,

        DYNAMIC_DEPTH,

        DATASPACE_DEPTH,

        DATASPACE_DYNAMIC_DEPTH,

    })

    public @interface DataSpaceDepth {};
@@ -398,14 +398,14 @@ public final class DataSpace { 
     *

     * This value is valid with formats HAL_PIXEL_FORMAT_Y16 and HAL_PIXEL_FORMAT_BLOB.

     */

    public static final int DEPTH = 4096;

    public static final int DATASPACE_DEPTH = 4096;



    /**

     * ISO 16684-1:2011(E) Dynamic Depth.

     *

     * Embedded depth metadata following the dynamic depth specification.

     */

    public static final int DYNAMIC_DEPTH = 4098;

    public static final int DATASPACE_DYNAMIC_DEPTH = 4098;



    /** @hide */

    @Retention(RetentionPolicy.SOURCE)