commit edcfe7c513a111890b7bd245cf10fa105e910277
author Dan Stoza <stoza@google.com> Mon Jun 01 18:25:50 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 01 18:25:50 2015 +0000
tree b0b9924354601ba77827b309739d3ee4a8dc57d1
parent c76683f51f6ad1f5493d9af43bf868601f474060
parent 24fa67f62ac9a751b6fcbd7bd69960388a4b2f5b

Merge "libui: Apply GRALLOC_USAGE_ALLOC_MASK during alloc"

libs/ui/GraphicBufferAllocator.cpp

diff --git a/libs/ui/GraphicBufferAllocator.cpp b/libs/ui/GraphicBufferAllocator.cpp
index 85e9675..9b265af 100644
--- a/libs/ui/GraphicBufferAllocator.cpp
+++ b/libs/ui/GraphicBufferAllocator.cpp
@@ -104,6 +104,9 @@
     // 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<int>(width),
             static_cast<int>(height), format, static_cast<int>(usage), handle,