diff options
| author | 2024-01-23 17:54:41 +0000 | |
|---|---|---|
| committer | 2024-01-23 17:54:41 +0000 | |
| commit | 4d67752afa01d38dff24b2017e61e178dbac0239 (patch) | |
| tree | 87c1d797affc499d76d762ef69fbc136f48de239 | |
| parent | 39255ff49ea8c2980faea56b355db7c376dfcdb9 (diff) | |
| parent | 33c8e29762e57f6e8fd47a3a171b23f3bf1b580d (diff) | |
Merge "Remove _uint suffix from AHardwareBuffer API" into main
| -rw-r--r-- | core/api/current.txt | 4 | ||||
| -rw-r--r-- | core/java/android/hardware/HardwareBuffer.java | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 25e93ce84c56..adb4eaca2d11 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -18368,8 +18368,8 @@ package android.hardware { field public static final int RGBX_8888 = 2; // 0x2 field public static final int RGB_565 = 4; // 0x4 field public static final int RGB_888 = 3; // 0x3 - field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int RG_1616_UINT = 58; // 0x3a - field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int R_16_UINT = 57; // 0x39 + field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int RG_1616 = 58; // 0x3a + field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int R_16 = 57; // 0x39 field @FlaggedApi("com.android.graphics.hwui.flags.requested_formats_v") public static final int R_8 = 56; // 0x38 field public static final int S_UI8 = 53; // 0x35 field public static final long USAGE_COMPOSER_OVERLAY = 2048L; // 0x800L diff --git a/core/java/android/hardware/HardwareBuffer.java b/core/java/android/hardware/HardwareBuffer.java index f5b3a7b56302..0047b7d69282 100644 --- a/core/java/android/hardware/HardwareBuffer.java +++ b/core/java/android/hardware/HardwareBuffer.java @@ -67,8 +67,8 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { S_UI8, YCBCR_P010, R_8, - R_16_UINT, - RG_1616_UINT, + R_16, + RG_1616, RGBA_10101010, }) public @interface Format { @@ -119,13 +119,13 @@ public final class HardwareBuffer implements Parcelable, AutoCloseable { * implicit unsigned normalized. */ @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_REQUESTED_FORMATS_V) - public static final int R_16_UINT = 0x39; + public static final int R_16 = 0x39; /** * Format: 16 bits each red, green. Bits should be represented in unsigned integer, * instead of the implicit unsigned normalized. */ @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_REQUESTED_FORMATS_V) - public static final int RG_1616_UINT = 0x3a; + public static final int RG_1616 = 0x3a; /** Format: 10 bits each red, green, blue, alpha */ @FlaggedApi(com.android.graphics.hwui.flags.Flags.FLAG_REQUESTED_FORMATS_V) public static final int RGBA_10101010 = 0x3b; |