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

Commit 44ed106f authored by Krzysztof Kosiński's avatar Krzysztof Kosiński Committed by android-build-merger
Browse files

Merge "Do not allocate protected AHardwareBuffers with CPU access." into pi-dev am: bcb9443c 

am: a133b8f2

Change-Id: I3260db7d51c586420b2fb1714f74331bf4e66486
parents 3a470409 a133b8f2

libs/nativewindow/AHardwareBuffer.cpp

+7 −0
Original line number Diff line number Diff line
@@ -60,6 +60,13 @@ int AHardwareBuffer_allocate(const AHardwareBuffer_Desc* desc, AHardwareBuffer** 
        return BAD_VALUE;

    }



    if ((desc->usage & (AHARDWAREBUFFER_USAGE_CPU_READ_MASK | AHARDWAREBUFFER_USAGE_CPU_WRITE_MASK)) &&

        (desc->usage & AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT)) {

        ALOGE("AHARDWAREBUFFER_USAGE_PROTECTED_CONTENT requires AHARDWAREBUFFER_USAGE_CPU_READ_NEVER "

              "and AHARDWAREBUFFER_USAGE_CPU_WRITE_NEVER");

        return BAD_VALUE;

    }



    uint64_t usage =  AHardwareBuffer_convertToGrallocUsageBits(desc->usage);

    sp<GraphicBuffer> gbuffer(new GraphicBuffer(

            desc->width, desc->height, format, desc->layers, usage,