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

Commit 7b49b4be authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "deprecate L_8, LA_88 and RGB_332 in sdk"

parents 6513daef e9d4c71f

api/current.txt

+4 −4
Original line number Diff line number Diff line
@@ -8629,14 +8629,14 @@ package android.graphics { 
    method public static void getPixelFormatInfo(int, android.graphics.PixelFormat);

    field public static final int A_8 = 8; // 0x8

    field public static final deprecated int JPEG = 256; // 0x100

    field public static final int LA_88 = 10; // 0xa

    field public static final deprecated int LA_88 = 10; // 0xa

    field public static final int L_8 = 9; // 0x9

    field public static final int OPAQUE = -1; // 0xffffffff

    field public static final int RGBA_4444 = 7; // 0x7

    field public static final int RGBA_5551 = 6; // 0x6

    field public static final deprecated int RGBA_4444 = 7; // 0x7

    field public static final deprecated int RGBA_5551 = 6; // 0x6

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

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

    field public static final int RGB_332 = 11; // 0xb

    field public static final deprecated int RGB_332 = 11; // 0xb

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

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

    field public static final int TRANSLUCENT = -3; // 0xfffffffd

graphics/java/android/graphics/PixelFormat.java

+4 −0
Original line number Diff line number Diff line
@@ -39,11 +39,15 @@ public class PixelFormat 
    public static final int RGB_888     = 3;

    public static final int RGB_565     = 4;



    @Deprecated

    public static final int RGBA_5551   = 6;

    @Deprecated

    public static final int RGBA_4444   = 7;

    public static final int A_8         = 8;

    public static final int L_8         = 9;

    @Deprecated

    public static final int LA_88       = 0xA;

    @Deprecated

    public static final int RGB_332     = 0xB;

include/ui/PixelFormat.h

+6 −7
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ enum { 
    PIXEL_FORMAT_RGBA_5551   = HAL_PIXEL_FORMAT_RGBA_5551,  // 16-bit ARGB

    PIXEL_FORMAT_RGBA_4444   = HAL_PIXEL_FORMAT_RGBA_4444,  // 16-bit ARGB

    PIXEL_FORMAT_A_8         = 8,                           // 8-bit A



    // New formats can be added if they're also defined in

    // pixelflinger/format.h

};



typedef int32_t PixelFormat;
@@ -83,6 +80,8 @@ struct PixelFormatInfo { 
        ALPHA   = 1,

        RGB     = 2,

        RGBA    = 3,

        L       = 4,

        LA      = 5,

        OTHER   = 0xFF

    };

libs/ui/PixelFormat.cpp

+4 −1
Original line number Diff line number Diff line
@@ -48,7 +48,10 @@ static Info const sPixelFormatInfos[] = { 
        { 4, 32, {32,24,  24,16,  16, 8,   8, 0 }, PixelFormatInfo::RGBA },

        { 2, 16, { 1, 0,  16,11,  11, 6,   6, 1 }, PixelFormatInfo::RGBA },

        { 2, 16, { 4, 0,  16,12,  12, 8,   8, 4 }, PixelFormatInfo::RGBA },

        { 1,  8, { 8, 0,   0, 0,   0, 0,   0, 0 }, PixelFormatInfo::ALPHA}

        { 1,  8, { 8, 0,   0, 0,   0, 0,   0, 0 }, PixelFormatInfo::ALPHA},

        { 1,  8, { 0, 0,   8, 0,   8, 0,   8, 0 }, PixelFormatInfo::L    },

        { 2, 16, {16, 8,   8, 0,   8, 0,   8, 0 }, PixelFormatInfo::LA   },

        { 1,  8, { 0, 0,   8, 5,   5, 2,   2, 0 }, PixelFormatInfo::RGB  },

};



static const Info* gGetPixelFormatTable(size_t* numEntries) {

services/surfaceflinger/Layer.cpp

+5 −1
Original line number Diff line number Diff line
@@ -160,7 +160,10 @@ status_t Layer::setBuffers( uint32_t w, uint32_t h, 
    // this surfaces pixel format

    PixelFormatInfo info;

    status_t err = getPixelFormatInfo(format, &info);

    if (err) return err;

    if (err) {

        ALOGE("unsupported pixelformat %d", format);

        return err;

    }



    // the display's pixel format

    const DisplayHardware& hw(graphicPlane(0).displayHardware());
@@ -170,6 +173,7 @@ status_t Layer::setBuffers( uint32_t w, uint32_t h, 
    // never allow a surface larger than what our underlying GL implementation

    // can handle.

    if ((uint32_t(w)>maxSurfaceDims) || (uint32_t(h)>maxSurfaceDims)) {

        ALOGE("dimensions too large %u x %u", uint32_t(w), uint32_t(h));

        return BAD_VALUE;

    }