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

Commit d1d79ff1 authored by Alec Mouri's avatar Alec Mouri
Browse files

Add back in mBufferId to GraphicBuffer ABI. 

Removing mBufferId and getBufferId() changed GraphicBuffer's ABI, which
breaks some GSI builds. It's not well understood where the break
happens, but it's likely due to reinterpret_casting a raw pointer over
a pass-through HAL or similar stable API, which causes issues when
loading GSI as a prebuilt on top of an old Android version. For now,
fixing the ABI break to band-aid the issue

Bug: 160443973
Test: builds
Test: Flash Android 11 GSI on top of Android 10 vendor iage
Test: CtsMediaV2TestCases

Change-Id: Ib6bc78b1651169e9ad4b2602839b84432ffa58c9
parent 14a60813

libs/ui/include/ui/GraphicBuffer.h

+3 −0
Original line number Diff line number Diff line
@@ -260,6 +260,9 @@ private: 


    uint64_t mId;



    // Unused, but removing this may break GSI.

    int32_t mBufferId = -1;



    // Stores the generation number of this buffer. If this number does not

    // match the BufferQueue's internal generation number (set through

    // IGBP::setGenerationNumber), attempts to attach the buffer will fail.