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

Commit 28d9060e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add warning that GB<->AHB is not VNDK-safe"

parents 9b333f04 029f9a77
Loading
Loading
Loading
Loading
+13 −4
Original line number Diff line number Diff line
@@ -36,6 +36,15 @@

#include <hardware/gralloc.h>

#if defined(__ANDROID_APEX__) || defined(__ANDROID_VNDK__)
// TODO: Provide alternatives that aren't broken
#define AHB_CONVERSION                                                                          \
    [[deprecated("WARNING: VNDK casts beteween GraphicBuffer & AHardwareBuffer are UNSAFE and " \
                 "will be removed in the future")]]
#else
#define AHB_CONVERSION
#endif

namespace android {

class GraphicBufferMapper;
@@ -80,10 +89,10 @@ public:

    static sp<GraphicBuffer> from(ANativeWindowBuffer *);

    static GraphicBuffer* fromAHardwareBuffer(AHardwareBuffer*);
    static GraphicBuffer const* fromAHardwareBuffer(AHardwareBuffer const*);
    AHardwareBuffer* toAHardwareBuffer();
    AHardwareBuffer const* toAHardwareBuffer() const;
    AHB_CONVERSION static GraphicBuffer* fromAHardwareBuffer(AHardwareBuffer*);
    AHB_CONVERSION static GraphicBuffer const* fromAHardwareBuffer(AHardwareBuffer const*);
    AHB_CONVERSION AHardwareBuffer* toAHardwareBuffer();
    AHB_CONVERSION AHardwareBuffer const* toAHardwareBuffer() const;

    // Create a GraphicBuffer to be unflatten'ed into or be reallocated.
    GraphicBuffer();