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

Commit 12ca5279 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

libui: filter out invalid buffer usage bits 

Before fixing callers to omit the invalid bits, we need to make sure
HALs do not use those bits.  Let's filter the invalid bits out and
see if anything breaks.

Bug: 72323293
Bug: 72703005
Test: play videos on Pixels
Change-Id: I539f9b785f9010b7b7cdc5f72d59391211f337e5
parent 6894160b

libs/ui/Gralloc2.cpp

+0 −3
Original line number Diff line number Diff line
@@ -42,9 +42,6 @@ uint64_t getValid10UsageBits() { 
        for (const auto bit : hardware::hidl_enum_range<BufferUsage>()) {

            bits = bits | bit;

        }

        // TODO(b/72323293, b/72703005): Remove these additional bits

        bits = bits | (1 << 10) | (1 << 13);



        return bits;

    }();

    return valid10UsageBits;

libs/ui/GraphicBufferAllocator.cpp

+3 −0
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ status_t GraphicBufferAllocator::allocate(uint32_t width, uint32_t height, 
    if (layerCount < 1)

        layerCount = 1;



    // TODO(b/72323293, b/72703005): Remove these invalid bits from callers

    usage &= ~static_cast<uint64_t>((1 << 10) | (1 << 13));



    Gralloc2::IMapper::BufferDescriptorInfo info = {};

    info.width = width;

    info.height = height;