Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add prefix to newly introduced IntDef for DEPTH"

Browse Source
This commit is contained in:
TreeHugger Robot
2022-06-08 15:40:54 +00:00
committed by Android (Google) Code Review
parent abd36d7bfe 0b92887bac
commit ceb0aee261
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/api/current.txt
View File

@@ -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

8
core/java/android/hardware/DataSpace.java
View File

@@ -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)