From b8efdc40039e4900ae2c64fbdfa03906c867ec84 Mon Sep 17 00:00:00 2001 From: Dan Stoza Date: Fri, 29 May 2015 12:48:04 -0700 Subject: [PATCH] libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc Applies GRALLOC_USAGE_ALLOC_MASK to the incoming usage bits before calling alloc on the gralloc module. This filters out the new flag GRALLOC_USAGE_FOREIGN_BUFFERS, which is used to send a hint to the producer, but which does not affect the allocation of buffers. Bug: 19801661 Change-Id: Ia37a3eddba2e97598e50ac3e10877430adfa9247 --- libs/ui/GraphicBufferAllocator.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp index 85e967567..9b265af2b 100644 --- a/libs/ui/GraphicBufferAllocator.cpp +++ b/libs/ui/GraphicBufferAllocator.cpp @@ -104,6 +104,9 @@ status_t GraphicBufferAllocator::alloc(uint32_t width, uint32_t height, // we have a h/w allocator and h/w buffer is requested status_t err; + // Filter out any usage bits that should not be passed to the gralloc module + usage &= GRALLOC_USAGE_ALLOC_MASK; + int outStride = 0; err = mAllocDev->alloc(mAllocDev, static_cast(width), static_cast(height), format, static_cast(usage), handle,