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

Commit bcb9443c authored by Krzysztof Kosiński's avatar Krzysztof Kosiński Committed by Android (Google) Code Review
Browse files

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

parents 25503383 00bf6427

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,