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

Commit 4d67752a authored by Trevor Black's avatar Trevor Black Committed by Android (Google) Code Review
Browse files

Merge "Remove _uint suffix from AHardwareBuffer API" into main

parents 39255ff4 33c8e297

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -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

core/java/android/hardware/HardwareBuffer.java

+4 −4
Original line number Diff line number Diff line
@@ -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;